Fix rest integration tests due to tile layer name change from topp:states to states in core/src/main/resources/geowebcache.xml

Author: groldan

geowebcache/web/src/test/java/org/geowebcache/jetty/RestIntegrationTest.java

@@ -394,9 +394,9 @@ public void testGetLayers() throws Exception {
             assertThat(
                     doc,
                     hasXPath(
-                            "/layers/layer[name/text()='topp:states']/atom:link/@href",
+                            "/layers/layer[name/text()='states']/atom:link/@href",
                             equalTo(jetty.getUri()
-                                    .resolve("/geowebcache/rest/layers/topp:states.xml")
+                                    .resolve("/geowebcache/rest/layers/states.xml")
                                     .toString())));
             assertThat(
                     doc,
@@ -557,8 +557,7 @@ public void testGetLayer() throws Exception {
                 admin.getClient(), equalTo(200), doc -> {
                     assertThat(doc, hasXPath("/wmsLayer/name", equalTo("img states")));
                     assertThat(
-                            doc,
-                            hasXPath("/wmsLayer/wmsUrl/string", equalTo("http://localhost:8080/geoserver/topp/wms?")));
+                            doc, hasXPath("/wmsLayer/wmsUrl/string", equalTo("http://localhost:8080/geoserver/wms?")));
                     assertThat(doc, hasXPath("/wmsLayer/wmsLayers", equalTo("nurc:Img_Sample,topp:states")));
                 });
     }
@@ -1024,15 +1023,15 @@ public void testSeedPost() throws Exception {
                 "</seedRequest>";
 
         try (CloseableHttpResponse response =
-                handlePost(URI.create("/geowebcache/rest/seed/topp:states.xml"), admin.getClient(), seedLayer)) {
+                handlePost(URI.create("/geowebcache/rest/seed/states.xml"), admin.getClient(), seedLayer)) {
             assertEquals(200, response.getStatusLine().getStatusCode());
         }
     }
 
     @Test
     public void testSeedGet() throws Exception {
         try (CloseableHttpResponse response =
-                handleGet(URI.create("/geowebcache/rest/seed/topp:states"), admin.getClient())) {
+                handleGet(URI.create("/geowebcache/rest/seed/states"), admin.getClient())) {
             assertEquals(200, response.getStatusLine().getStatusCode());
         }
     }
@@ -1047,7 +1046,7 @@ public void testSeedGetNoLayer() throws Exception {
     @Test
     public void testSeedGetSeedForm() throws Exception {
         try (CloseableHttpResponse response =
-                handleGet(URI.create("/geowebcache/rest/seed/topp:states"), admin.getClient())) {
+                handleGet(URI.create("/geowebcache/rest/seed/states"), admin.getClient())) {
             assertEquals(200, response.getStatusLine().getStatusCode());
         }
     }
@@ -1062,15 +1061,15 @@ public void testSeedGetJson() throws Exception {
     @Test
     public void testSeedGetLayerJson() throws Exception {
         try (CloseableHttpResponse response =
-                handleGet(URI.create("/geowebcache/rest/seed/topp:states.json"), admin.getClient())) {
+                handleGet(URI.create("/geowebcache/rest/seed/states.json"), admin.getClient())) {
             assertEquals(200, response.getStatusLine().getStatusCode());
         }
     }
 
     @Test
     public void testSeedGetLayerXml() throws Exception {
         try (CloseableHttpResponse response =
-                handleGet(URI.create("/geowebcache/rest/seed/topp:states.xml"), admin.getClient())) {
+                handleGet(URI.create("/geowebcache/rest/seed/states.xml"), admin.getClient())) {
             assertEquals(200, response.getStatusLine().getStatusCode());
         }
     }
@@ -1088,7 +1087,7 @@ public void testKillAll() throws Exception {
     public void testLayerKillAll() throws Exception {
         String killCommand = "kill_all=all";
         try (CloseableHttpResponse response =
-                handlePost(URI.create("/geowebcache/rest/seed/topp:states"), admin.getClient(), killCommand)) {
+                handlePost(URI.create("/geowebcache/rest/seed/states"), admin.getClient(), killCommand)) {
             assertEquals(200, response.getStatusLine().getStatusCode());
         }
     }