diff --git a/build.gradle b/build.gradle index c321b7d..a2e1189 100644 --- a/build.gradle +++ b/build.gradle @@ -5,13 +5,14 @@ import java.nio.file.Files import java.nio.file.Paths plugins { - id "com.diffplug.spotless" version "6.1.0" + id "com.diffplug.spotless" version "6.1.2" id "com.github.ben-manes.versions" version "0.41.0" id "com.github.spotbugs" version "4.8.0" // id "de.aaschmid.cpd" version "3.3" id "eclipse" id "jacoco" id "java" + id "java-test-fixtures" /* Used for publishing test fixtures package */ id "maven-publish" id "net.ltgt.errorprone" version "2.0.2" id "org.openstreetmap.josm" version "0.7.1" @@ -53,10 +54,19 @@ repositories { sourceSets { test { java { - srcDirs = ["test/unit"] + srcDirs = ["src/test/unit"] } resources { - srcDirs = ["test/data"] + srcDirs = ["src/test/resources"] + } + } + testFixtures { + java { + srcDirs = ["src/test/unit"] + setIncludes(new HashSet(['org/openstreetmap/josm/plugins/mapwithai/testutils/**/*.java'])) + } + resources { + srcDirs = ["src/test/resources"] } } intTest { @@ -65,10 +75,10 @@ sourceSets { runtimeClasspath += sourceSets.main.output runtimeClasspath += sourceSets.test.output java { - srcDirs = ["test/integration"] + srcDirs = ["src/test/integration"] } resources { - srcDirs = ["test/data"] + srcDirs = ["src/test/resources"] } } } @@ -76,13 +86,14 @@ sourceSets { def versions = [ awaitility: "4.1.1", errorprone: "2.10.0", - jacoco: "0.8.5", + jacoco: "0.8.7", jmockit: "1.49", junit: "5.8.2", pmd: "6.20.0", spotbugs: "4.5.3", wiremock: "2.32.0", findsecbugs: "1.11.0", + josm: properties.get("plugin.compile.version"), ] dependencies { @@ -92,18 +103,21 @@ dependencies { spotbugsPlugins "com.h3xstream.findsecbugs:findsecbugs-plugin:${versions.findsecbugs}" errorprone("com.google.errorprone:error_prone_core:${versions.errorprone}") - testImplementation("org.junit.jupiter:junit-jupiter-api:${versions.junit}") - testRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${versions.junit}") - testImplementation("org.junit.vintage:junit-vintage-engine:${versions.junit}") - testImplementation("org.junit.jupiter:junit-jupiter-params:${versions.junit}") - testImplementation("org.jmockit:jmockit:${versions.jmockit}") - testImplementation("com.github.spotbugs:spotbugs-annotations:${versions.spotbugs}") - testImplementation("org.openstreetmap.josm:josm-unittest:"){changing=true} - testImplementation("com.github.tomakehurst:wiremock-jre8:${versions.wiremock}") - testImplementation("org.awaitility:awaitility:${versions.awaitility}") + testFixturesImplementation("org.junit.jupiter:junit-jupiter-api:${versions.junit}") + testFixturesRuntimeOnly("org.junit.jupiter:junit-jupiter-engine:${versions.junit}") + testFixturesImplementation("org.junit.vintage:junit-vintage-engine:${versions.junit}") + testFixturesImplementation("org.junit.jupiter:junit-jupiter-params:${versions.junit}") + testFixturesImplementation("org.jmockit:jmockit:${versions.jmockit}") + testFixturesImplementation("com.github.spotbugs:spotbugs-annotations:${versions.spotbugs}") + testFixturesImplementation("org.openstreetmap.josm:josm:${versions.josm}") + testFixturesImplementation("org.openstreetmap.josm:josm-unittest:"){changing=true} + testFixturesImplementation("com.github.tomakehurst:wiremock-jre8:${versions.wiremock}") + testFixturesImplementation("org.awaitility:awaitility:${versions.awaitility}") } configurations { + testImplementation.extendsFrom testFixturesImplementation + testRuntimeOnly.extendsFrom testFixturesRuntimeOnly intTestRuntimeOnly.extendsFrom testRuntimeOnly intTestImplementation.extendsFrom testImplementation } diff --git a/build.xml b/build.xml index e40b677..537641c 100644 --- a/build.xml +++ b/build.xml @@ -1,6 +1,7 @@ + diff --git a/ivy.xml b/ivy.xml index 1e0bae6..47f3468 100644 --- a/ivy.xml +++ b/ivy.xml @@ -6,7 +6,7 @@ - - + + diff --git a/test/.gitignore b/src/test/.gitignore similarity index 100% rename from test/.gitignore rename to src/test/.gitignore diff --git a/test/integration/org/openstreetmap/josm/plugins/mapwithai/io/mapwithai/MapWithAISourceReaderTestIT.java b/src/test/integration/org/openstreetmap/josm/plugins/mapwithai/io/mapwithai/MapWithAISourceReaderTestIT.java similarity index 100% rename from test/integration/org/openstreetmap/josm/plugins/mapwithai/io/mapwithai/MapWithAISourceReaderTestIT.java rename to src/test/integration/org/openstreetmap/josm/plugins/mapwithai/io/mapwithai/MapWithAISourceReaderTestIT.java diff --git a/test/resources/wiremock/__files/MapWithAIStyle.zip b/src/test/resources/wiremock/__files/MapWithAIStyle.zip similarity index 100% rename from test/resources/wiremock/__files/MapWithAIStyle.zip rename to src/test/resources/wiremock/__files/MapWithAIStyle.zip diff --git a/test/resources/wiremock/__files/josmfile?page=Styles/MapWithAI&zip=1 b/src/test/resources/wiremock/__files/josmfile?page=Styles/MapWithAI&zip=1 similarity index 100% rename from test/resources/wiremock/__files/josmfile?page=Styles/MapWithAI&zip=1 rename to src/test/resources/wiremock/__files/josmfile?page=Styles/MapWithAI&zip=1 diff --git a/test/resources/wiremock/mappings/06_nodes-5f086efd-b8fa-4340-b368-cd4fa7626e0b.json b/src/test/resources/wiremock/mappings/06_nodes-5f086efd-b8fa-4340-b368-cd4fa7626e0b.json similarity index 100% rename from test/resources/wiremock/mappings/06_nodes-5f086efd-b8fa-4340-b368-cd4fa7626e0b.json rename to src/test/resources/wiremock/mappings/06_nodes-5f086efd-b8fa-4340-b368-cd4fa7626e0b.json diff --git a/test/resources/wiremock/mappings/06_nodes-7938c30e-bd58-4c8c-a716-49e434123ccb.json b/src/test/resources/wiremock/mappings/06_nodes-7938c30e-bd58-4c8c-a716-49e434123ccb.json similarity index 100% rename from test/resources/wiremock/mappings/06_nodes-7938c30e-bd58-4c8c-a716-49e434123ccb.json rename to src/test/resources/wiremock/mappings/06_nodes-7938c30e-bd58-4c8c-a716-49e434123ccb.json diff --git a/test/resources/wiremock/mappings/06_nodes-98af8a28-e882-4d58-a828-f149ef8b3913.json b/src/test/resources/wiremock/mappings/06_nodes-98af8a28-e882-4d58-a828-f149ef8b3913.json similarity index 100% rename from test/resources/wiremock/mappings/06_nodes-98af8a28-e882-4d58-a828-f149ef8b3913.json rename to src/test/resources/wiremock/mappings/06_nodes-98af8a28-e882-4d58-a828-f149ef8b3913.json diff --git a/test/resources/wiremock/mappings/06_nodes-aa8912c8-d2fc-4c2d-bf5e-f0192dad2bb4.json b/src/test/resources/wiremock/mappings/06_nodes-aa8912c8-d2fc-4c2d-bf5e-f0192dad2bb4.json similarity index 100% rename from test/resources/wiremock/mappings/06_nodes-aa8912c8-d2fc-4c2d-bf5e-f0192dad2bb4.json rename to src/test/resources/wiremock/mappings/06_nodes-aa8912c8-d2fc-4c2d-bf5e-f0192dad2bb4.json diff --git a/test/resources/wiremock/mappings/capabilities-cf884424-9817-4f92-a3af-6b5aa2bc4b0e.json b/src/test/resources/wiremock/mappings/capabilities-cf884424-9817-4f92-a3af-6b5aa2bc4b0e.json similarity index 100% rename from test/resources/wiremock/mappings/capabilities-cf884424-9817-4f92-a3af-6b5aa2bc4b0e.json rename to src/test/resources/wiremock/mappings/capabilities-cf884424-9817-4f92-a3af-6b5aa2bc4b0e.json diff --git a/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_abilene_tx_buildings_featureserver-cf2fc003-e869-4bff-9c52-16e73cf89b9d.json b/src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_abilene_tx_buildings_featureserver-cf2fc003-e869-4bff-9c52-16e73cf89b9d.json similarity index 100% rename from test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_abilene_tx_buildings_featureserver-cf2fc003-e869-4bff-9c52-16e73cf89b9d.json rename to src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_abilene_tx_buildings_featureserver-cf2fc003-e869-4bff-9c52-16e73cf89b9d.json diff --git a/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_alexandria_va_addresses_featureserver-ffce8d3a-c21a-410b-9303-2b59875b76aa.json b/src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_alexandria_va_addresses_featureserver-ffce8d3a-c21a-410b-9303-2b59875b76aa.json similarity index 100% rename from test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_alexandria_va_addresses_featureserver-ffce8d3a-c21a-410b-9303-2b59875b76aa.json rename to src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_alexandria_va_addresses_featureserver-ffce8d3a-c21a-410b-9303-2b59875b76aa.json diff --git a/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_alexandria_va_addresses_featureserver_0-ee34e070-0bf4-4a36-bfe5-4833a8f25ae5.json b/src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_alexandria_va_addresses_featureserver_0-ee34e070-0bf4-4a36-bfe5-4833a8f25ae5.json similarity index 100% rename from test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_alexandria_va_addresses_featureserver_0-ee34e070-0bf4-4a36-bfe5-4833a8f25ae5.json rename to src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_alexandria_va_addresses_featureserver_0-ee34e070-0bf4-4a36-bfe5-4833a8f25ae5.json diff --git a/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_baton_rouge_la_buildings_featureserver-dd6fd63f-5bf7-44e1-96cb-3accb0d9e652.json b/src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_baton_rouge_la_buildings_featureserver-dd6fd63f-5bf7-44e1-96cb-3accb0d9e652.json similarity index 100% rename from test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_baton_rouge_la_buildings_featureserver-dd6fd63f-5bf7-44e1-96cb-3accb0d9e652.json rename to src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_baton_rouge_la_buildings_featureserver-dd6fd63f-5bf7-44e1-96cb-3accb0d9e652.json diff --git a/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_boston_ma_addresses_featureserver-1878a845-e581-4519-9568-57e3c4ca5681.json b/src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_boston_ma_addresses_featureserver-1878a845-e581-4519-9568-57e3c4ca5681.json similarity index 100% rename from test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_boston_ma_addresses_featureserver-1878a845-e581-4519-9568-57e3c4ca5681.json rename to src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_boston_ma_addresses_featureserver-1878a845-e581-4519-9568-57e3c4ca5681.json diff --git a/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_flagstaff_az_addresses_featureserver-f5b30af0-0177-459b-ac7a-b4fc0be7d99a.json b/src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_flagstaff_az_addresses_featureserver-f5b30af0-0177-459b-ac7a-b4fc0be7d99a.json similarity index 100% rename from test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_flagstaff_az_addresses_featureserver-f5b30af0-0177-459b-ac7a-b4fc0be7d99a.json rename to src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_flagstaff_az_addresses_featureserver-f5b30af0-0177-459b-ac7a-b4fc0be7d99a.json diff --git a/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_flagstaff_az_addresses_featureserver_0-d0e9831e-6eff-4f7e-83ee-f09bad38c40d.json b/src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_flagstaff_az_addresses_featureserver_0-d0e9831e-6eff-4f7e-83ee-f09bad38c40d.json similarity index 100% rename from test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_flagstaff_az_addresses_featureserver_0-d0e9831e-6eff-4f7e-83ee-f09bad38c40d.json rename to src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_flagstaff_az_addresses_featureserver_0-d0e9831e-6eff-4f7e-83ee-f09bad38c40d.json diff --git a/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_fort_collins_co_buildings_featureserver-5b042812-8b74-43cc-8f3c-5455209e6174.json b/src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_fort_collins_co_buildings_featureserver-5b042812-8b74-43cc-8f3c-5455209e6174.json similarity index 100% rename from test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_fort_collins_co_buildings_featureserver-5b042812-8b74-43cc-8f3c-5455209e6174.json rename to src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_fort_collins_co_buildings_featureserver-5b042812-8b74-43cc-8f3c-5455209e6174.json diff --git a/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_franklin_county_oh_buildings_featureserver-9f5608b0-7f9b-4744-9bfa-aca77b68a338.json b/src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_franklin_county_oh_buildings_featureserver-9f5608b0-7f9b-4744-9bfa-aca77b68a338.json similarity index 100% rename from test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_franklin_county_oh_buildings_featureserver-9f5608b0-7f9b-4744-9bfa-aca77b68a338.json rename to src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_franklin_county_oh_buildings_featureserver-9f5608b0-7f9b-4744-9bfa-aca77b68a338.json diff --git a/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_franklincounty_buildings_featureserver-4a594e6d-4b81-42ad-b547-39005f2a5f62.json b/src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_franklincounty_buildings_featureserver-4a594e6d-4b81-42ad-b547-39005f2a5f62.json similarity index 100% rename from test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_franklincounty_buildings_featureserver-4a594e6d-4b81-42ad-b547-39005f2a5f62.json rename to src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_franklincounty_buildings_featureserver-4a594e6d-4b81-42ad-b547-39005f2a5f62.json diff --git a/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_franklincounty_buildings_featureserver_0-8cd10b04-891d-4d27-9282-82e7349f5bd3.json b/src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_franklincounty_buildings_featureserver_0-8cd10b04-891d-4d27-9282-82e7349f5bd3.json similarity index 100% rename from test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_franklincounty_buildings_featureserver_0-8cd10b04-891d-4d27-9282-82e7349f5bd3.json rename to src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_franklincounty_buildings_featureserver_0-8cd10b04-891d-4d27-9282-82e7349f5bd3.json diff --git a/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_indianapolis_in_buildings_featureserver-0839729e-481d-474b-b6c4-186632418ff8.json b/src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_indianapolis_in_buildings_featureserver-0839729e-481d-474b-b6c4-186632418ff8.json similarity index 100% rename from test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_indianapolis_in_buildings_featureserver-0839729e-481d-474b-b6c4-186632418ff8.json rename to src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_indianapolis_in_buildings_featureserver-0839729e-481d-474b-b6c4-186632418ff8.json diff --git a/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_johns_creek_ga_addresses_featureserver-1af1902a-7f3e-406c-baae-c87beb5f51b2.json b/src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_johns_creek_ga_addresses_featureserver-1af1902a-7f3e-406c-baae-c87beb5f51b2.json similarity index 100% rename from test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_johns_creek_ga_addresses_featureserver-1af1902a-7f3e-406c-baae-c87beb5f51b2.json rename to src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_johns_creek_ga_addresses_featureserver-1af1902a-7f3e-406c-baae-c87beb5f51b2.json diff --git a/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_johns_creek_ga_buildings_featureserver-1f76a677-dad5-47c2-86f9-a6215bd47f09.json b/src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_johns_creek_ga_buildings_featureserver-1f76a677-dad5-47c2-86f9-a6215bd47f09.json similarity index 100% rename from test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_johns_creek_ga_buildings_featureserver-1f76a677-dad5-47c2-86f9-a6215bd47f09.json rename to src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_johns_creek_ga_buildings_featureserver-1f76a677-dad5-47c2-86f9-a6215bd47f09.json diff --git a/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_madison_county_ky_addresses_featureserver-66ef9aca-060f-4595-ba9d-426efca7992a.json b/src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_madison_county_ky_addresses_featureserver-66ef9aca-060f-4595-ba9d-426efca7992a.json similarity index 100% rename from test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_madison_county_ky_addresses_featureserver-66ef9aca-060f-4595-ba9d-426efca7992a.json rename to src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_madison_county_ky_addresses_featureserver-66ef9aca-060f-4595-ba9d-426efca7992a.json diff --git a/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_orange_county_ca_buildings_featureserver-757edf0f-0dc4-4b42-869e-1bc2cf3ecf31.json b/src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_orange_county_ca_buildings_featureserver-757edf0f-0dc4-4b42-869e-1bc2cf3ecf31.json similarity index 100% rename from test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_orange_county_ca_buildings_featureserver-757edf0f-0dc4-4b42-869e-1bc2cf3ecf31.json rename to src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_orange_county_ca_buildings_featureserver-757edf0f-0dc4-4b42-869e-1bc2cf3ecf31.json diff --git a/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_orange_county_ca_buildings_featureserver_0-e759c7d0-92ff-4db5-9bd8-25c500797126.json b/src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_orange_county_ca_buildings_featureserver_0-e759c7d0-92ff-4db5-9bd8-25c500797126.json similarity index 100% rename from test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_orange_county_ca_buildings_featureserver_0-e759c7d0-92ff-4db5-9bd8-25c500797126.json rename to src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_orange_county_ca_buildings_featureserver_0-e759c7d0-92ff-4db5-9bd8-25c500797126.json diff --git a/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_orange_county_ca_buildings_v2_featureserver-e0115f5a-2f2f-4c3c-bd23-97d8b183e7f7.json b/src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_orange_county_ca_buildings_v2_featureserver-e0115f5a-2f2f-4c3c-bd23-97d8b183e7f7.json similarity index 100% rename from test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_orange_county_ca_buildings_v2_featureserver-e0115f5a-2f2f-4c3c-bd23-97d8b183e7f7.json rename to src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_orange_county_ca_buildings_v2_featureserver-e0115f5a-2f2f-4c3c-bd23-97d8b183e7f7.json diff --git a/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_pottawattamie_county_ia_buildings_featureserver-146e68bf-e36f-4d1a-9670-5cdbe2c3f636.json b/src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_pottawattamie_county_ia_buildings_featureserver-146e68bf-e36f-4d1a-9670-5cdbe2c3f636.json similarity index 100% rename from test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_pottawattamie_county_ia_buildings_featureserver-146e68bf-e36f-4d1a-9670-5cdbe2c3f636.json rename to src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_pottawattamie_county_ia_buildings_featureserver-146e68bf-e36f-4d1a-9670-5cdbe2c3f636.json diff --git a/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_richland_county_nd_addresses_featureserver-6b8d2ee4-b32f-4e81-80d1-bdf6bf8bba3f.json b/src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_richland_county_nd_addresses_featureserver-6b8d2ee4-b32f-4e81-80d1-bdf6bf8bba3f.json similarity index 100% rename from test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_richland_county_nd_addresses_featureserver-6b8d2ee4-b32f-4e81-80d1-bdf6bf8bba3f.json rename to src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_richland_county_nd_addresses_featureserver-6b8d2ee4-b32f-4e81-80d1-bdf6bf8bba3f.json diff --git a/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_riverside_ca_buildings_featureserver-1b8f292c-d3b0-4281-ad07-680b02579e6b.json b/src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_riverside_ca_buildings_featureserver-1b8f292c-d3b0-4281-ad07-680b02579e6b.json similarity index 100% rename from test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_riverside_ca_buildings_featureserver-1b8f292c-d3b0-4281-ad07-680b02579e6b.json rename to src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_riverside_ca_buildings_featureserver-1b8f292c-d3b0-4281-ad07-680b02579e6b.json diff --git a/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_riverside_ca_buildings_featureserver_0-9bba8228-60ea-4b25-b140-ea7b4aeb79ab.json b/src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_riverside_ca_buildings_featureserver_0-9bba8228-60ea-4b25-b140-ea7b4aeb79ab.json similarity index 100% rename from test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_riverside_ca_buildings_featureserver_0-9bba8228-60ea-4b25-b140-ea7b4aeb79ab.json rename to src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_riverside_ca_buildings_featureserver_0-9bba8228-60ea-4b25-b140-ea7b4aeb79ab.json diff --git a/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_riverside_ca_buildings_v2_featureserver-646c0289-b022-4f04-a4e2-b402a256f18d.json b/src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_riverside_ca_buildings_v2_featureserver-646c0289-b022-4f04-a4e2-b402a256f18d.json similarity index 100% rename from test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_riverside_ca_buildings_v2_featureserver-646c0289-b022-4f04-a4e2-b402a256f18d.json rename to src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_riverside_ca_buildings_v2_featureserver-646c0289-b022-4f04-a4e2-b402a256f18d.json diff --git a/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_sandiego_county_ca_addresses_featureserver-35444ef3-ef5b-4ba3-b2e6-8eaa2b18bb4c.json b/src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_sandiego_county_ca_addresses_featureserver-35444ef3-ef5b-4ba3-b2e6-8eaa2b18bb4c.json similarity index 100% rename from test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_sandiego_county_ca_addresses_featureserver-35444ef3-ef5b-4ba3-b2e6-8eaa2b18bb4c.json rename to src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_sandiego_county_ca_addresses_featureserver-35444ef3-ef5b-4ba3-b2e6-8eaa2b18bb4c.json diff --git a/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_sangis_buildings_featureserver-7100a55a-11f9-4a63-ab7e-27e463171e03.json b/src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_sangis_buildings_featureserver-7100a55a-11f9-4a63-ab7e-27e463171e03.json similarity index 100% rename from test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_sangis_buildings_featureserver-7100a55a-11f9-4a63-ab7e-27e463171e03.json rename to src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_sangis_buildings_featureserver-7100a55a-11f9-4a63-ab7e-27e463171e03.json diff --git a/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_sarpy_county_ne_addresses_featureserver-7950efe2-fcb1-4457-9b3a-fd281eb49684.json b/src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_sarpy_county_ne_addresses_featureserver-7950efe2-fcb1-4457-9b3a-fd281eb49684.json similarity index 100% rename from test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_sarpy_county_ne_addresses_featureserver-7950efe2-fcb1-4457-9b3a-fd281eb49684.json rename to src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_sarpy_county_ne_addresses_featureserver-7950efe2-fcb1-4457-9b3a-fd281eb49684.json diff --git a/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_sarpy_county_ne_addresses_featureserver_1-89bb3fed-c485-401c-a9b9-9c5b367f81a0.json b/src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_sarpy_county_ne_addresses_featureserver_1-89bb3fed-c485-401c-a9b9-9c5b367f81a0.json similarity index 100% rename from test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_sarpy_county_ne_addresses_featureserver_1-89bb3fed-c485-401c-a9b9-9c5b367f81a0.json rename to src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_sarpy_county_ne_addresses_featureserver_1-89bb3fed-c485-401c-a9b9-9c5b367f81a0.json diff --git a/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_sarpy_county_ne_buildings_featureserver-1ab90e03-6781-4f0b-97c0-9e66b728c81c.json b/src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_sarpy_county_ne_buildings_featureserver-1ab90e03-6781-4f0b-97c0-9e66b728c81c.json similarity index 100% rename from test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_sarpy_county_ne_buildings_featureserver-1ab90e03-6781-4f0b-97c0-9e66b728c81c.json rename to src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_sarpy_county_ne_buildings_featureserver-1ab90e03-6781-4f0b-97c0-9e66b728c81c.json diff --git a/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_sarpy_county_ne_buildings_featureserver_1-1edea050-3368-40f5-80ae-099dba138e0d.json b/src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_sarpy_county_ne_buildings_featureserver_1-1edea050-3368-40f5-80ae-099dba138e0d.json similarity index 100% rename from test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_sarpy_county_ne_buildings_featureserver_1-1edea050-3368-40f5-80ae-099dba138e0d.json rename to src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_sarpy_county_ne_buildings_featureserver_1-1edea050-3368-40f5-80ae-099dba138e0d.json diff --git a/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_sioux_falls_sd_addresses_featureserver-c933f432-3e62-4fec-be6e-4f95894bd3b9.json b/src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_sioux_falls_sd_addresses_featureserver-c933f432-3e62-4fec-be6e-4f95894bd3b9.json similarity index 100% rename from test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_sioux_falls_sd_addresses_featureserver-c933f432-3e62-4fec-be6e-4f95894bd3b9.json rename to src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_sioux_falls_sd_addresses_featureserver-c933f432-3e62-4fec-be6e-4f95894bd3b9.json diff --git a/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_sioux_falls_sd_buildings_featureserver-3f1883b1-14dc-402f-bbbe-8d5f346ffcd6.json b/src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_sioux_falls_sd_buildings_featureserver-3f1883b1-14dc-402f-bbbe-8d5f346ffcd6.json similarity index 100% rename from test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_sioux_falls_sd_buildings_featureserver-3f1883b1-14dc-402f-bbbe-8d5f346ffcd6.json rename to src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_sioux_falls_sd_buildings_featureserver-3f1883b1-14dc-402f-bbbe-8d5f346ffcd6.json diff --git a/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_tacoma_wa_buildings_featureserver-d08e2666-3342-4c02-8f80-279e5910a37d.json b/src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_tacoma_wa_buildings_featureserver-d08e2666-3342-4c02-8f80-279e5910a37d.json similarity index 100% rename from test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_tacoma_wa_buildings_featureserver-d08e2666-3342-4c02-8f80-279e5910a37d.json rename to src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_tacoma_wa_buildings_featureserver-d08e2666-3342-4c02-8f80-279e5910a37d.json diff --git a/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_tampa_fl_buildings_featureserver-204ccfc2-0167-4cd7-a8df-3f281d10d5d0.json b/src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_tampa_fl_buildings_featureserver-204ccfc2-0167-4cd7-a8df-3f281d10d5d0.json similarity index 100% rename from test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_tampa_fl_buildings_featureserver-204ccfc2-0167-4cd7-a8df-3f281d10d5d0.json rename to src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_tampa_fl_buildings_featureserver-204ccfc2-0167-4cd7-a8df-3f281d10d5d0.json diff --git a/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_wb_zanzibar_buildings_featureserver-66d2a4b2-09ce-46d3-b9c9-a0c7489fefab.json b/src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_wb_zanzibar_buildings_featureserver-66d2a4b2-09ce-46d3-b9c9-a0c7489fefab.json similarity index 100% rename from test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_wb_zanzibar_buildings_featureserver-66d2a4b2-09ce-46d3-b9c9-a0c7489fefab.json rename to src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_wb_zanzibar_buildings_featureserver-66d2a4b2-09ce-46d3-b9c9-a0c7489fefab.json diff --git a/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_wb_zanzibar_buildings_featureserver_0-d64a22d3-e6e0-4dc6-ae5c-f9a2ba8f8485.json b/src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_wb_zanzibar_buildings_featureserver_0-d64a22d3-e6e0-4dc6-ae5c-f9a2ba8f8485.json similarity index 100% rename from test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_wb_zanzibar_buildings_featureserver_0-d64a22d3-e6e0-4dc6-ae5c-f9a2ba8f8485.json rename to src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_wb_zanzibar_buildings_featureserver_0-d64a22d3-e6e0-4dc6-ae5c-f9a2ba8f8485.json diff --git a/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_williamson_county_tx_buildings_featureserver-6db57544-0cfa-4b2f-8cd3-5845cac15108.json b/src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_williamson_county_tx_buildings_featureserver-6db57544-0cfa-4b2f-8cd3-5845cac15108.json similarity index 100% rename from test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_williamson_county_tx_buildings_featureserver-6db57544-0cfa-4b2f-8cd3-5845cac15108.json rename to src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_williamson_county_tx_buildings_featureserver-6db57544-0cfa-4b2f-8cd3-5845cac15108.json diff --git a/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_yavapai_county_az_buildings_featureserver-037b364c-e9e2-4478-8bd9-8bd9a3b3c9aa.json b/src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_yavapai_county_az_buildings_featureserver-037b364c-e9e2-4478-8bd9-8bd9a3b3c9aa.json similarity index 100% rename from test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_yavapai_county_az_buildings_featureserver-037b364c-e9e2-4478-8bd9-8bd9a3b3c9aa.json rename to src/test/resources/wiremock/mappings/do88dok2xjtucxd1_arcgis_rest_services_yavapai_county_az_buildings_featureserver-037b364c-e9e2-4478-8bd9-8bd9a3b3c9aa.json diff --git a/test/resources/wiremock/mappings/faviconico-0a890cfc-c50c-44be-973b-acf92836e513.json b/src/test/resources/wiremock/mappings/faviconico-0a890cfc-c50c-44be-973b-acf92836e513.json similarity index 100% rename from test/resources/wiremock/mappings/faviconico-0a890cfc-c50c-44be-973b-acf92836e513.json rename to src/test/resources/wiremock/mappings/faviconico-0a890cfc-c50c-44be-973b-acf92836e513.json diff --git a/test/resources/wiremock/mappings/faviconico-b9f04630-0820-4f01-a541-b9d4226b8f84.json b/src/test/resources/wiremock/mappings/faviconico-b9f04630-0820-4f01-a541-b9d4226b8f84.json similarity index 100% rename from test/resources/wiremock/mappings/faviconico-b9f04630-0820-4f01-a541-b9d4226b8f84.json rename to src/test/resources/wiremock/mappings/faviconico-b9f04630-0820-4f01-a541-b9d4226b8f84.json diff --git a/test/resources/wiremock/mappings/faviconico-ca7c6f18-2915-4be6-b28a-1729a6217b54.json b/src/test/resources/wiremock/mappings/faviconico-ca7c6f18-2915-4be6-b28a-1729a6217b54.json similarity index 100% rename from test/resources/wiremock/mappings/faviconico-ca7c6f18-2915-4be6-b28a-1729a6217b54.json rename to src/test/resources/wiremock/mappings/faviconico-ca7c6f18-2915-4be6-b28a-1729a6217b54.json diff --git a/test/resources/wiremock/mappings/josm_mapwithai_json_conflation_serversjson-fb2197f1-81fd-445d-bb90-b6219d187af6.json b/src/test/resources/wiremock/mappings/josm_mapwithai_json_conflation_serversjson-fb2197f1-81fd-445d-bb90-b6219d187af6.json similarity index 100% rename from test/resources/wiremock/mappings/josm_mapwithai_json_conflation_serversjson-fb2197f1-81fd-445d-bb90-b6219d187af6.json rename to src/test/resources/wiremock/mappings/josm_mapwithai_json_conflation_serversjson-fb2197f1-81fd-445d-bb90-b6219d187af6.json diff --git a/test/resources/wiremock/mappings/josm_mapwithai_json_sourcesjson-23497750-675c-440a-986a-34dd14b047f8.json b/src/test/resources/wiremock/mappings/josm_mapwithai_json_sourcesjson-23497750-675c-440a-986a-34dd14b047f8.json similarity index 100% rename from test/resources/wiremock/mappings/josm_mapwithai_json_sourcesjson-23497750-675c-440a-986a-34dd14b047f8.json rename to src/test/resources/wiremock/mappings/josm_mapwithai_json_sourcesjson-23497750-675c-440a-986a-34dd14b047f8.json diff --git a/test/resources/wiremock/mappings/josmfile-Styles-MapWithAI.json b/src/test/resources/wiremock/mappings/josmfile-Styles-MapWithAI.json similarity index 100% rename from test/resources/wiremock/mappings/josmfile-Styles-MapWithAI.json rename to src/test/resources/wiremock/mappings/josmfile-Styles-MapWithAI.json diff --git a/test/resources/wiremock/mappings/maps_ml_roads-04b70b03-d148-4e3d-a1fc-98334cd10e64.json b/src/test/resources/wiremock/mappings/maps_ml_roads-04b70b03-d148-4e3d-a1fc-98334cd10e64.json similarity index 100% rename from test/resources/wiremock/mappings/maps_ml_roads-04b70b03-d148-4e3d-a1fc-98334cd10e64.json rename to src/test/resources/wiremock/mappings/maps_ml_roads-04b70b03-d148-4e3d-a1fc-98334cd10e64.json diff --git a/test/resources/wiremock/mappings/maps_ml_roads-0bc0c6c3-8e38-4da4-8f85-c07bde3ef54d.json b/src/test/resources/wiremock/mappings/maps_ml_roads-0bc0c6c3-8e38-4da4-8f85-c07bde3ef54d.json similarity index 100% rename from test/resources/wiremock/mappings/maps_ml_roads-0bc0c6c3-8e38-4da4-8f85-c07bde3ef54d.json rename to src/test/resources/wiremock/mappings/maps_ml_roads-0bc0c6c3-8e38-4da4-8f85-c07bde3ef54d.json diff --git a/test/resources/wiremock/mappings/maps_ml_roads-146193dd-3082-495b-b350-8164e2858f8d.json b/src/test/resources/wiremock/mappings/maps_ml_roads-146193dd-3082-495b-b350-8164e2858f8d.json similarity index 100% rename from test/resources/wiremock/mappings/maps_ml_roads-146193dd-3082-495b-b350-8164e2858f8d.json rename to src/test/resources/wiremock/mappings/maps_ml_roads-146193dd-3082-495b-b350-8164e2858f8d.json diff --git a/test/resources/wiremock/mappings/maps_ml_roads-3098faf3-c028-43c6-9263-42f1cab7c161.json b/src/test/resources/wiremock/mappings/maps_ml_roads-3098faf3-c028-43c6-9263-42f1cab7c161.json similarity index 100% rename from test/resources/wiremock/mappings/maps_ml_roads-3098faf3-c028-43c6-9263-42f1cab7c161.json rename to src/test/resources/wiremock/mappings/maps_ml_roads-3098faf3-c028-43c6-9263-42f1cab7c161.json diff --git a/test/resources/wiremock/mappings/maps_ml_roads-4df1e72e-a62e-48b6-806d-99fd74956742.json b/src/test/resources/wiremock/mappings/maps_ml_roads-4df1e72e-a62e-48b6-806d-99fd74956742.json similarity index 100% rename from test/resources/wiremock/mappings/maps_ml_roads-4df1e72e-a62e-48b6-806d-99fd74956742.json rename to src/test/resources/wiremock/mappings/maps_ml_roads-4df1e72e-a62e-48b6-806d-99fd74956742.json diff --git a/test/resources/wiremock/mappings/maps_ml_roads-53133862-d606-4976-b016-a35be71df3fb.json b/src/test/resources/wiremock/mappings/maps_ml_roads-53133862-d606-4976-b016-a35be71df3fb.json similarity index 100% rename from test/resources/wiremock/mappings/maps_ml_roads-53133862-d606-4976-b016-a35be71df3fb.json rename to src/test/resources/wiremock/mappings/maps_ml_roads-53133862-d606-4976-b016-a35be71df3fb.json diff --git a/test/resources/wiremock/mappings/maps_ml_roads-580f7b5b-cb9a-4092-8a39-bf8b714e6efe.json b/src/test/resources/wiremock/mappings/maps_ml_roads-580f7b5b-cb9a-4092-8a39-bf8b714e6efe.json similarity index 100% rename from test/resources/wiremock/mappings/maps_ml_roads-580f7b5b-cb9a-4092-8a39-bf8b714e6efe.json rename to src/test/resources/wiremock/mappings/maps_ml_roads-580f7b5b-cb9a-4092-8a39-bf8b714e6efe.json diff --git a/test/resources/wiremock/mappings/maps_ml_roads-715854d4-ba75-4289-89fe-9352c3d3ed6b.json b/src/test/resources/wiremock/mappings/maps_ml_roads-715854d4-ba75-4289-89fe-9352c3d3ed6b.json similarity index 100% rename from test/resources/wiremock/mappings/maps_ml_roads-715854d4-ba75-4289-89fe-9352c3d3ed6b.json rename to src/test/resources/wiremock/mappings/maps_ml_roads-715854d4-ba75-4289-89fe-9352c3d3ed6b.json diff --git a/test/resources/wiremock/mappings/maps_ml_roads-9b87a83b-8600-4f49-9362-9bb066b02133.json b/src/test/resources/wiremock/mappings/maps_ml_roads-9b87a83b-8600-4f49-9362-9bb066b02133.json similarity index 100% rename from test/resources/wiremock/mappings/maps_ml_roads-9b87a83b-8600-4f49-9362-9bb066b02133.json rename to src/test/resources/wiremock/mappings/maps_ml_roads-9b87a83b-8600-4f49-9362-9bb066b02133.json diff --git a/test/resources/wiremock/mappings/maps_ml_roads-ce324a60-116f-48ae-8999-fa4321b68f18.json b/src/test/resources/wiremock/mappings/maps_ml_roads-ce324a60-116f-48ae-8999-fa4321b68f18.json similarity index 100% rename from test/resources/wiremock/mappings/maps_ml_roads-ce324a60-116f-48ae-8999-fa4321b68f18.json rename to src/test/resources/wiremock/mappings/maps_ml_roads-ce324a60-116f-48ae-8999-fa4321b68f18.json diff --git a/test/resources/wiremock/mappings/maps_ml_roads-e3da5e5b-126f-44e1-8411-93eff12bd08a.json b/src/test/resources/wiremock/mappings/maps_ml_roads-e3da5e5b-126f-44e1-8411-93eff12bd08a.json similarity index 100% rename from test/resources/wiremock/mappings/maps_ml_roads-e3da5e5b-126f-44e1-8411-93eff12bd08a.json rename to src/test/resources/wiremock/mappings/maps_ml_roads-e3da5e5b-126f-44e1-8411-93eff12bd08a.json diff --git a/test/resources/wiremock/mappings/maps_ml_roads-e543fb8b-a680-4a1d-9f90-a793b7a7a6a6.json b/src/test/resources/wiremock/mappings/maps_ml_roads-e543fb8b-a680-4a1d-9f90-a793b7a7a6a6.json similarity index 100% rename from test/resources/wiremock/mappings/maps_ml_roads-e543fb8b-a680-4a1d-9f90-a793b7a7a6a6.json rename to src/test/resources/wiremock/mappings/maps_ml_roads-e543fb8b-a680-4a1d-9f90-a793b7a7a6a6.json diff --git a/test/resources/wiremock/mappings/maps_ml_roads-f72200ba-e99d-481a-90e9-c4e7ddd3398b.json b/src/test/resources/wiremock/mappings/maps_ml_roads-f72200ba-e99d-481a-90e9-c4e7ddd3398b.json similarity index 100% rename from test/resources/wiremock/mappings/maps_ml_roads-f72200ba-e99d-481a-90e9-c4e7ddd3398b.json rename to src/test/resources/wiremock/mappings/maps_ml_roads-f72200ba-e99d-481a-90e9-c4e7ddd3398b.json diff --git a/test/resources/wiremock/mappings/sharing_rest_content_groups_bdf6c800b3ae453b9db239e03d7c1727_search-2b3ba100-8f68-4bd8-977f-86cf5c5212b2.json b/src/test/resources/wiremock/mappings/sharing_rest_content_groups_bdf6c800b3ae453b9db239e03d7c1727_search-2b3ba100-8f68-4bd8-977f-86cf5c5212b2.json similarity index 100% rename from test/resources/wiremock/mappings/sharing_rest_content_groups_bdf6c800b3ae453b9db239e03d7c1727_search-2b3ba100-8f68-4bd8-977f-86cf5c5212b2.json rename to src/test/resources/wiremock/mappings/sharing_rest_content_groups_bdf6c800b3ae453b9db239e03d7c1727_search-2b3ba100-8f68-4bd8-977f-86cf5c5212b2.json diff --git a/test/resources/wiremock/mappings/sharing_rest_content_groups_bdf6c800b3ae453b9db239e03d7c1727_search-b603ddec-a465-4f56-8406-bfef84c6e30f.json b/src/test/resources/wiremock/mappings/sharing_rest_content_groups_bdf6c800b3ae453b9db239e03d7c1727_search-b603ddec-a465-4f56-8406-bfef84c6e30f.json similarity index 100% rename from test/resources/wiremock/mappings/sharing_rest_content_groups_bdf6c800b3ae453b9db239e03d7c1727_search-b603ddec-a465-4f56-8406-bfef84c6e30f.json rename to src/test/resources/wiremock/mappings/sharing_rest_content_groups_bdf6c800b3ae453b9db239e03d7c1727_search-b603ddec-a465-4f56-8406-bfef84c6e30f.json diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/MapWithAIPluginTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/MapWithAIPluginTest.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/MapWithAIPluginTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/MapWithAIPluginTest.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/UpdateProdTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/UpdateProdTest.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/UpdateProdTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/UpdateProdTest.java index d21bc64..befdf7c 100644 --- a/test/unit/org/openstreetmap/josm/plugins/mapwithai/UpdateProdTest.java +++ b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/UpdateProdTest.java @@ -4,11 +4,11 @@ package org.openstreetmap.josm.plugins.mapwithai; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; +import javax.swing.JOptionPane; + import java.awt.GraphicsEnvironment; import java.lang.reflect.Field; -import javax.swing.JOptionPane; - import org.junit.jupiter.api.Test; import org.openstreetmap.josm.TestUtils; import org.openstreetmap.josm.data.Version; diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/actions/AddMapWithAILayerActionTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/actions/AddMapWithAILayerActionTest.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/actions/AddMapWithAILayerActionTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/actions/AddMapWithAILayerActionTest.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/BoundingBoxMapWithAIDownloaderTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/BoundingBoxMapWithAIDownloaderTest.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/BoundingBoxMapWithAIDownloaderTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/BoundingBoxMapWithAIDownloaderTest.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/DataConflationSenderTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/DataConflationSenderTest.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/DataConflationSenderTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/DataConflationSenderTest.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/DetectTaskingManagerUtilsTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/DetectTaskingManagerUtilsTest.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/DetectTaskingManagerUtilsTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/DetectTaskingManagerUtilsTest.java index 07e7b5c..bc8803f 100644 --- a/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/DetectTaskingManagerUtilsTest.java +++ b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/DetectTaskingManagerUtilsTest.java @@ -17,9 +17,9 @@ import org.openstreetmap.josm.data.osm.BBox; import org.openstreetmap.josm.gui.MainApplication; import org.openstreetmap.josm.gui.layer.GpxLayer; import org.openstreetmap.josm.testutils.JOSMTestRules; +import org.openstreetmap.josm.testutils.annotations.BasicPreferences; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import org.openstreetmap.josm.testutils.annotations.BasicPreferences; /** * @author Taylor Smock diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/DownloadListenerTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/DownloadListenerTest.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/DownloadListenerTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/DownloadListenerTest.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/DownloadMapWithAITaskTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/DownloadMapWithAITaskTest.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/DownloadMapWithAITaskTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/DownloadMapWithAITaskTest.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/GetDataRunnableTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/GetDataRunnableTest.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/GetDataRunnableTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/GetDataRunnableTest.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIActionTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIActionTest.java similarity index 99% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIActionTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIActionTest.java index 68e7092..642604c 100644 --- a/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIActionTest.java +++ b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIActionTest.java @@ -10,7 +10,6 @@ import static org.junit.jupiter.api.Assertions.assertNull; import static org.junit.jupiter.api.Assertions.assertSame; import static org.junit.jupiter.api.Assertions.assertTrue; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import org.awaitility.Durations; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; @@ -30,6 +29,8 @@ import org.openstreetmap.josm.testutils.JOSMTestRules; import org.openstreetmap.josm.testutils.annotations.BasicPreferences; import org.openstreetmap.josm.tools.Territories; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Test class for {@link MapWithAIAction} * diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIAvailabilityTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIAvailabilityTest.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIAvailabilityTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIAvailabilityTest.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIDataUtilsTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIDataUtilsTest.java similarity index 99% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIDataUtilsTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIDataUtilsTest.java index aa7ebb6..04d0807 100644 --- a/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIDataUtilsTest.java +++ b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIDataUtilsTest.java @@ -14,7 +14,6 @@ import java.util.List; import java.util.TreeSet; import java.util.stream.Collectors; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.openstreetmap.josm.TestUtils; @@ -38,6 +37,8 @@ import org.openstreetmap.josm.testutils.JOSMTestRules; import org.openstreetmap.josm.testutils.annotations.BasicPreferences; import org.openstreetmap.josm.tools.Logging; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Test class for {@link MapWithAIDataUtils} * diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAILayerTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAILayerTest.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAILayerTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAILayerTest.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIMoveActionTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIMoveActionTest.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIMoveActionTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIMoveActionTest.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIObjectTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIObjectTest.java similarity index 99% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIObjectTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIObjectTest.java index b8ffc4a..d2f7b4b 100644 --- a/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIObjectTest.java +++ b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIObjectTest.java @@ -5,15 +5,14 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertTrue; +import javax.swing.text.JTextComponent; + import java.awt.Component; import java.util.Arrays; import java.util.Collections; import java.util.List; import java.util.stream.Stream; -import javax.swing.text.JTextComponent; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -29,6 +28,8 @@ import org.openstreetmap.josm.plugins.mapwithai.commands.MapWithAIAddCommand; import org.openstreetmap.josm.testutils.JOSMTestRules; import org.openstreetmap.josm.testutils.annotations.BasicPreferences; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * @author Taylor Smock * diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIRemoteControlTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIRemoteControlTest.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIRemoteControlTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIRemoteControlTest.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIUploadHookTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIUploadHookTest.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIUploadHookTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MapWithAIUploadHookTest.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MergeDuplicateWaysActionTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MergeDuplicateWaysActionTest.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MergeDuplicateWaysActionTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MergeDuplicateWaysActionTest.java index cd98857..453e04a 100644 --- a/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MergeDuplicateWaysActionTest.java +++ b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/backend/MergeDuplicateWaysActionTest.java @@ -21,9 +21,9 @@ import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.gui.MainApplication; import org.openstreetmap.josm.gui.layer.OsmDataLayer; import org.openstreetmap.josm.testutils.JOSMTestRules; +import org.openstreetmap.josm.testutils.annotations.BasicPreferences; import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; -import org.openstreetmap.josm.testutils.annotations.BasicPreferences; /** * @author Taylor Smock diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/AddNodeToWayCommandTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/AddNodeToWayCommandTest.java similarity index 99% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/AddNodeToWayCommandTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/AddNodeToWayCommandTest.java index 786ec31..8dc42d8 100644 --- a/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/AddNodeToWayCommandTest.java +++ b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/AddNodeToWayCommandTest.java @@ -8,7 +8,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.ArrayList; import java.util.List; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -21,6 +20,8 @@ import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.plugins.mapwithai.testutils.annotations.Command; import org.openstreetmap.josm.testutils.JOSMTestRules; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + @Command class AddNodeToWayCommandTest { private Node toAdd; diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/ConnectedCommandTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/ConnectedCommandTest.java similarity index 99% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/ConnectedCommandTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/ConnectedCommandTest.java index c6677a4..01c1fe5 100644 --- a/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/ConnectedCommandTest.java +++ b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/ConnectedCommandTest.java @@ -8,7 +8,6 @@ import static org.junit.jupiter.api.Assertions.assertTrue; import java.util.Collection; import java.util.Collections; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.openstreetmap.josm.TestUtils; @@ -21,6 +20,8 @@ import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.plugins.mapwithai.testutils.annotations.NoExceptions; import org.openstreetmap.josm.testutils.JOSMTestRules; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + @NoExceptions class ConnectedCommandTest { /** diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/CreateConnectionsCommandTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/CreateConnectionsCommandTest.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/CreateConnectionsCommandTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/CreateConnectionsCommandTest.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/DuplicateCommandTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/DuplicateCommandTest.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/DuplicateCommandTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/DuplicateCommandTest.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/MapWithAIAddComandTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/MapWithAIAddComandTest.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/MapWithAIAddComandTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/MapWithAIAddComandTest.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/MergeBuildingAddressTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/MergeBuildingAddressTest.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/MergeBuildingAddressTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/MergeBuildingAddressTest.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/MergeDuplicateWaysTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/MergeDuplicateWaysTest.java similarity index 99% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/MergeDuplicateWaysTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/MergeDuplicateWaysTest.java index 8ba398b..c12ec8b 100644 --- a/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/MergeDuplicateWaysTest.java +++ b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/MergeDuplicateWaysTest.java @@ -20,7 +20,6 @@ import java.util.Map; import java.util.Set; import java.util.stream.Collectors; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.openstreetmap.josm.TestUtils; @@ -33,6 +32,8 @@ import org.openstreetmap.josm.plugins.mapwithai.backend.GetDataRunnable; import org.openstreetmap.josm.testutils.JOSMTestRules; import org.openstreetmap.josm.tools.Pair; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * @author Taylor Smock */ diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/MovePrimitiveDataSetCommandTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/MovePrimitiveDataSetCommandTest.java similarity index 99% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/MovePrimitiveDataSetCommandTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/MovePrimitiveDataSetCommandTest.java index d513b70..31ca897 100644 --- a/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/MovePrimitiveDataSetCommandTest.java +++ b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/MovePrimitiveDataSetCommandTest.java @@ -11,7 +11,6 @@ import java.util.Arrays; import java.util.Collection; import java.util.Collections; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; import org.openstreetmap.josm.TestUtils; @@ -25,6 +24,8 @@ import org.openstreetmap.josm.data.osm.Way; import org.openstreetmap.josm.plugins.mapwithai.testutils.annotations.Command; import org.openstreetmap.josm.testutils.JOSMTestRules; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + @Command class MovePrimitiveDataSetCommandTest { @RegisterExtension diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/conflation/AbstractConflationCommandTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/conflation/AbstractConflationCommandTest.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/conflation/AbstractConflationCommandTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/conflation/AbstractConflationCommandTest.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/conflation/AlreadyConflatedCommandTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/conflation/AlreadyConflatedCommandTest.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/conflation/AlreadyConflatedCommandTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/conflation/AlreadyConflatedCommandTest.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/conflation/MergeAddressBuildingsTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/conflation/MergeAddressBuildingsTest.java similarity index 99% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/conflation/MergeAddressBuildingsTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/conflation/MergeAddressBuildingsTest.java index a36456e..f8f37c1 100644 --- a/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/conflation/MergeAddressBuildingsTest.java +++ b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/conflation/MergeAddressBuildingsTest.java @@ -9,7 +9,6 @@ import static org.openstreetmap.josm.tools.I18n.tr; import java.util.Arrays; import java.util.Collection; -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -27,6 +26,8 @@ import org.openstreetmap.josm.plugins.mapwithai.commands.MergeAddressBuildings; import org.openstreetmap.josm.testutils.JOSMTestRules; import org.openstreetmap.josm.testutils.annotations.BasicPreferences; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + @org.openstreetmap.josm.plugins.mapwithai.testutils.annotations.Command @BasicPreferences class MergeAddressBuildingsTest { diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/conflation/cleanup/MissingConnectionTagsTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/conflation/cleanup/MissingConnectionTagsTest.java similarity index 99% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/conflation/cleanup/MissingConnectionTagsTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/conflation/cleanup/MissingConnectionTagsTest.java index 36028e3..c007863 100644 --- a/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/conflation/cleanup/MissingConnectionTagsTest.java +++ b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/commands/conflation/cleanup/MissingConnectionTagsTest.java @@ -5,14 +5,13 @@ import static org.junit.jupiter.api.Assertions.assertEquals; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; +import javax.swing.JOptionPane; + import java.util.Arrays; import java.util.Collections; import java.util.HashMap; import java.util.Map; -import javax.swing.JOptionPane; - -import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; @@ -33,6 +32,8 @@ import org.openstreetmap.josm.testutils.JOSMTestRules; import org.openstreetmap.josm.testutils.annotations.BasicPreferences; import org.openstreetmap.josm.testutils.mockers.WindowMocker; +import edu.umd.cs.findbugs.annotations.SuppressFBWarnings; + /** * Test class for {@link MissingConnectionTags} * diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/data/mapwithai/MapWithAIInfoTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/data/mapwithai/MapWithAIInfoTest.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/data/mapwithai/MapWithAIInfoTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/data/mapwithai/MapWithAIInfoTest.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/data/mapwithai/PreConflatedDataUtilsTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/data/mapwithai/PreConflatedDataUtilsTest.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/data/mapwithai/PreConflatedDataUtilsTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/data/mapwithai/PreConflatedDataUtilsTest.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/data/validation/tests/ConnectingNodeInformationTestTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/data/validation/tests/ConnectingNodeInformationTestTest.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/data/validation/tests/ConnectingNodeInformationTestTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/data/validation/tests/ConnectingNodeInformationTestTest.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/data/validation/tests/RoutingIslandsTestTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/data/validation/tests/RoutingIslandsTestTest.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/data/validation/tests/RoutingIslandsTestTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/data/validation/tests/RoutingIslandsTestTest.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/data/validation/tests/StreetAddressOrderTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/data/validation/tests/StreetAddressOrderTest.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/data/validation/tests/StreetAddressOrderTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/data/validation/tests/StreetAddressOrderTest.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/data/validation/tests/StreetAddressTestTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/data/validation/tests/StreetAddressTestTest.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/data/validation/tests/StreetAddressTestTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/data/validation/tests/StreetAddressTestTest.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/data/validation/tests/StubEndsTestTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/data/validation/tests/StubEndsTestTest.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/data/validation/tests/StubEndsTestTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/data/validation/tests/StubEndsTestTest.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/gui/MapWithAIMenuTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/gui/MapWithAIMenuTest.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/gui/MapWithAIMenuTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/gui/MapWithAIMenuTest.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/gui/download/MapWithAIDownloadSourceTypeTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/gui/download/MapWithAIDownloadSourceTypeTest.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/gui/download/MapWithAIDownloadSourceTypeTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/gui/download/MapWithAIDownloadSourceTypeTest.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/MapWithAIPreferencesTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/MapWithAIPreferencesTest.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/MapWithAIPreferencesTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/MapWithAIPreferencesTest.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/ReplacementPreferenceTableTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/ReplacementPreferenceTableTest.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/ReplacementPreferenceTableTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/ReplacementPreferenceTableTest.java index b725b1a..44e2771 100644 --- a/test/unit/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/ReplacementPreferenceTableTest.java +++ b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/ReplacementPreferenceTableTest.java @@ -4,11 +4,11 @@ package org.openstreetmap.josm.plugins.mapwithai.gui.preferences; import static org.junit.jupiter.api.Assertions.assertNotNull; import static org.junit.jupiter.api.Assertions.assertNull; -import java.util.ArrayList; - import javax.swing.JComponent; import javax.swing.JPanel; +import java.util.ArrayList; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.openstreetmap.josm.TestUtils; diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/mapwithai/AddMapWithAIPanelTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/mapwithai/AddMapWithAIPanelTest.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/mapwithai/AddMapWithAIPanelTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/mapwithai/AddMapWithAIPanelTest.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/mapwithai/MapWithAIDefaultLayerTableModelTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/mapwithai/MapWithAIDefaultLayerTableModelTest.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/mapwithai/MapWithAIDefaultLayerTableModelTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/mapwithai/MapWithAIDefaultLayerTableModelTest.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/mapwithai/MapWithAIProvidersPanelTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/mapwithai/MapWithAIProvidersPanelTest.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/mapwithai/MapWithAIProvidersPanelTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/mapwithai/MapWithAIProvidersPanelTest.java index 27e521f..adb4a6f 100644 --- a/test/unit/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/mapwithai/MapWithAIProvidersPanelTest.java +++ b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/gui/preferences/mapwithai/MapWithAIProvidersPanelTest.java @@ -5,14 +5,14 @@ import static org.junit.jupiter.api.Assertions.assertDoesNotThrow; import static org.junit.jupiter.api.Assertions.assertFalse; import static org.junit.jupiter.api.Assertions.assertTrue; -import java.lang.reflect.Field; -import java.util.Collections; -import java.util.stream.IntStream; - import javax.swing.JComponent; import javax.swing.JPanel; import javax.swing.JTable; +import java.lang.reflect.Field; +import java.util.Collections; +import java.util.stream.IntStream; + import org.junit.jupiter.api.BeforeEach; import org.junit.jupiter.api.Test; import org.junit.jupiter.api.extension.RegisterExtension; diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/io/mapwithai/ESRISourceReaderTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/io/mapwithai/ESRISourceReaderTest.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/io/mapwithai/ESRISourceReaderTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/io/mapwithai/ESRISourceReaderTest.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/io/mapwithai/MapWithAISourceReaderTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/io/mapwithai/MapWithAISourceReaderTest.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/io/mapwithai/MapWithAISourceReaderTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/io/mapwithai/MapWithAISourceReaderTest.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/ImageProviderMocker.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/ImageProviderMocker.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/ImageProviderMocker.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/ImageProviderMocker.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/MapWithAIPluginMock.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/MapWithAIPluginMock.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/MapWithAIPluginMock.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/MapWithAIPluginMock.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/MapWithAITestRules.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/MapWithAITestRules.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/MapWithAITestRules.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/MapWithAITestRules.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/MissingConnectionTagsMocker.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/MissingConnectionTagsMocker.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/MissingConnectionTagsMocker.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/MissingConnectionTagsMocker.java index 17bb9d1..d8ca0fb 100644 --- a/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/MissingConnectionTagsMocker.java +++ b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/MissingConnectionTagsMocker.java @@ -1,13 +1,13 @@ // License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.mapwithai.testutils; +import javax.swing.JOptionPane; + import java.util.Collection; import java.util.HashMap; import java.util.Map; import java.util.Objects; -import javax.swing.JOptionPane; - import org.openstreetmap.josm.command.Command; import org.openstreetmap.josm.data.validation.TestError; import org.openstreetmap.josm.plugins.mapwithai.commands.cleanup.MissingConnectionTags; diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/PleaseWaitDialogMocker.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/PleaseWaitDialogMocker.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/PleaseWaitDialogMocker.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/PleaseWaitDialogMocker.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/SwingUtilitiesMocker.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/SwingUtilitiesMocker.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/SwingUtilitiesMocker.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/SwingUtilitiesMocker.java index 6132705..d070bd7 100644 --- a/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/SwingUtilitiesMocker.java +++ b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/SwingUtilitiesMocker.java @@ -1,12 +1,12 @@ // License: GPL. For details, see LICENSE file. package org.openstreetmap.josm.plugins.mapwithai.testutils; +import javax.swing.SwingUtilities; + import java.util.ArrayList; import java.util.List; import java.util.concurrent.FutureTask; -import javax.swing.SwingUtilities; - import mockit.Invocation; import mockit.Mock; import mockit.MockUp; diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/annotations/BleedTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/annotations/BleedTest.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/annotations/BleedTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/annotations/BleedTest.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/annotations/Command.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/annotations/Command.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/annotations/Command.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/annotations/Command.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/annotations/MapWithAIConfig.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/annotations/MapWithAIConfig.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/annotations/MapWithAIConfig.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/annotations/MapWithAIConfig.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/annotations/MapWithAISources.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/annotations/MapWithAISources.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/annotations/MapWithAISources.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/annotations/MapWithAISources.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/annotations/NoExceptions.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/annotations/NoExceptions.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/annotations/NoExceptions.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/annotations/NoExceptions.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/annotations/Projection.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/annotations/Projection.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/annotations/Projection.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/annotations/Projection.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/annotations/SlowTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/annotations/SlowTest.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/annotations/SlowTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/annotations/SlowTest.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/annotations/Territories.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/annotations/Territories.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/annotations/Territories.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/annotations/Territories.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/annotations/Wiremock.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/annotations/Wiremock.java similarity index 98% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/annotations/Wiremock.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/annotations/Wiremock.java index ee8bca7..36f203e 100644 --- a/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/annotations/Wiremock.java +++ b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/annotations/Wiremock.java @@ -43,7 +43,7 @@ import com.github.tomakehurst.wiremock.http.Response; @BasicPreferences @HTTP @ExtendWith(Wiremock.TestMapWithAIUrls.class) -@BasicWiremock(value = "test/resources/wiremock", responseTransformers = Wiremock.WireMockUrlTransformer.class) +@BasicWiremock(value = "src/test/resources/wiremock", responseTransformers = Wiremock.WireMockUrlTransformer.class) public @interface Wiremock { /** * Set to {@code false} to turn off wiremock (use only in integration tests) diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/annotations/WoundedTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/annotations/WoundedTest.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/annotations/WoundedTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/testutils/annotations/WoundedTest.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/tools/BlacklistUtilsTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/tools/BlacklistUtilsTest.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/tools/BlacklistUtilsTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/tools/BlacklistUtilsTest.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/tools/MapPaintUtilsTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/tools/MapPaintUtilsTest.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/tools/MapPaintUtilsTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/tools/MapPaintUtilsTest.java diff --git a/test/unit/org/openstreetmap/josm/plugins/mapwithai/tools/MapWithAICopyProhibitTest.java b/src/test/unit/org/openstreetmap/josm/plugins/mapwithai/tools/MapWithAICopyProhibitTest.java similarity index 100% rename from test/unit/org/openstreetmap/josm/plugins/mapwithai/tools/MapWithAICopyProhibitTest.java rename to src/test/unit/org/openstreetmap/josm/plugins/mapwithai/tools/MapWithAICopyProhibitTest.java