See #23485/r18989: Fix broken tests

The tests just needed to have a category set.

git-svn-id: https://josm.openstreetmap.de/svn/trunk@18992 0c6e7542-c601-0410-84e7-c038aed88b3b

Author: taylor.smock

test/unit/org/openstreetmap/josm/data/imagery/WMSEndpointTileSourceTest.java

@@ -74,6 +74,7 @@ void testDefaultLayerSetInMaps() throws Exception {
                 "<name>OSM Inspector: Geometry</name>\n" +
                 "<id>OSM_Inspector-Geometry</id>\n" +
                 "<type>wms_endpoint</type>\n" +
+                "<category>qa</category>\n" +
                 "<url><![CDATA[" + tileServer.url("/capabilities") + "]]></url>\n" +
                 "<icon>data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAACXBIWXMAAAsSAAALEgHS3X78AAAB5UlEQVQ4y4WTwWsTURDG" +
                 "fy8W1yYmXZOqtGJJFyGw6KF7CEigwYuS0kthrYUi4i0iORS9BU9hQdA/ILcixVBrwENKLz1FUBB0wWOwYFAqxUNYTZq6BfM8yC5d05iBObz3vfnmm3kz4sqDh/zP" +
@@ -124,6 +125,7 @@ void testCustomHeadersServerSide() throws IOException {
                 "        <name lang=\"nb\">Norge i Bilder (historisk)</name>\n" +
                 "        <id>geovekst-nib-historic</id>\n" +
                 "        <type>wms_endpoint</type>\n" +
+                "        <category>photo</category>\n" +
                 "        <country-code>NO</country-code>\n" +
                 "        <description lang=\"en\">Historic Norwegian orthophotos and maps, courtesy of Geovekst and Norkart.</description>\n" +
                 "        <url><![CDATA[" + tileServer.url("/capabilities?SERVICE=WMS&REQUEST=GetCapabilities") + "]]></url>\n" +

test/unit/org/openstreetmap/josm/data/imagery/WMTSTileSourceTest.java

@@ -17,13 +17,10 @@
 import java.nio.file.Files;
 import java.nio.file.Paths;
 import java.util.ArrayList;
-import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 import java.util.concurrent.TimeUnit;
 
-import com.github.tomakehurst.wiremock.WireMockServer;
-import com.github.tomakehurst.wiremock.client.WireMock;
 import org.apache.commons.io.FileUtils;
 import org.junit.jupiter.api.Disabled;
 import org.junit.jupiter.api.Test;
@@ -47,6 +44,9 @@
 import org.openstreetmap.josm.testutils.annotations.Projection;
 import org.openstreetmap.josm.tools.ReflectionUtils;
 
+import com.github.tomakehurst.wiremock.WireMockServer;
+import com.github.tomakehurst.wiremock.client.WireMock;
+
 /**
  * Unit tests for class {@link WMTSTileSource}.
  */
@@ -275,9 +275,7 @@ void testProjectionWithENUAxis() throws IOException, WMTSGetCapabilitiesExceptio
     void testTwoTileSetsForOneProjection() throws Exception {
         ProjectionRegistry.setProjection(Projections.getProjectionByCode("EPSG:3857"));
         ImageryInfo ontario = getImagery(TestUtils.getTestDataRoot() + "wmts/WMTSCapabilities-Ontario.xml");
-        ontario.setDefaultLayers(Arrays.asList(new DefaultLayer[] {
-                new DefaultLayer(ImageryType.WMTS, "Basemap_Imagery_2014", null, "default028mm")
-        }));
+        ontario.setDefaultLayers(Collections.singletonList(new DefaultLayer(ImageryType.WMTS, "Basemap_Imagery_2014", null, "default028mm")));
         WMTSTileSource testSource = new WMTSTileSource(ontario);
         testSource.initProjection(ProjectionRegistry.getProjection());
         assertEquals(
@@ -292,9 +290,9 @@ void testTwoTileSetsForOneProjection() throws Exception {
     void testTwoTileSetsForOneProjectionSecondLayer() throws Exception {
         ProjectionRegistry.setProjection(Projections.getProjectionByCode("EPSG:3857"));
         ImageryInfo ontario = getImagery(TestUtils.getTestDataRoot() + "wmts/WMTSCapabilities-Ontario.xml");
-        ontario.setDefaultLayers(Arrays.asList(new DefaultLayer[] {
+        ontario.setDefaultLayers(Collections.singletonList(
                 new DefaultLayer(ImageryType.WMTS, "Basemap_Imagery_2014", null, "GoogleMapsCompatible")
-        }));
+        ));
         WMTSTileSource testSource = new WMTSTileSource(ontario);
         testSource.initProjection(ProjectionRegistry.getProjection());
         assertEquals(
@@ -392,6 +390,7 @@ void testDefaultLayer() throws Exception {
                 "<name>Landsat</name>\n" +
                 "<id>landsat</id>\n" +
                 "<type>wmts</type>\n" +
+                "<category>photo</category>\n" +
                 "<url><![CDATA[" + tileServer.url("/getcapabilities.xml") + "]]></url>\n" +
                 "<default-layers>" +
                 "<layer name=\"GEOGRAPHICALGRIDSYSTEMS.MAPS\" />" +