Change test application path for one of the tests to avoid them all u…

…sing "/services" which is kind of special for CXF being the location it uses for serving the html page that links to the wadl.
jbossws · Feb 17, 2016 · f7d3b94 · f7d3b94
1 parent e268b82
commit f7d3b94
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 6 deletions.
diff --git a/...rest-tests/src/test/java/org/jboss/test/jaxrs/examples/ex03_1/CustomerResource20Test.java b/...rest-tests/src/test/java/org/jboss/test/jaxrs/examples/ex03_1/CustomerResource20Test.java
@@ -79,11 +79,11 @@ public void testCustomerResource() throws Exception
                  + "<country>USA</country>"
                  + "</customer>";
 
-         Response response = client.target(baseURL + "services/customers").request().post(Entity.xml(xml));
+         Response response = client.target(baseURL + "myservices/customers").request().post(Entity.xml(xml));
          if (response.getStatus() != 201)
             throw new RuntimeException("Failed to create");
          String location = response.getLocation().toString();
-         Assert.assertTrue(location.contains("jaxrs20-examples-ex03_1/services/customers/1"));
+         Assert.assertTrue(location.contains("jaxrs20-examples-ex03_1/myservices/customers/1"));
          response.close();
 
          String customer = client.target(location).request().get(String.class);

diff --git a/...d-rest-tests/src/test/java/org/jboss/test/jaxrs/examples/ex03_1/CustomerResourceTest.java b/...d-rest-tests/src/test/java/org/jboss/test/jaxrs/examples/ex03_1/CustomerResourceTest.java
@@ -77,7 +77,7 @@ public void testCustomerResource() throws Exception
               + "<country>USA</country>"
               + "</customer>";
 
-      URL postUrl = new URL(baseURL + "services/customers");
+      URL postUrl = new URL(baseURL + "myservices/customers");
       HttpURLConnection connection = (HttpURLConnection) postUrl.openConnection();
       connection.setDoOutput(true);
       connection.setInstanceFollowRedirects(false);
@@ -87,11 +87,11 @@ public void testCustomerResource() throws Exception
       os.write(newCustomer.getBytes());
       os.flush();
       Assert.assertEquals(HttpURLConnection.HTTP_CREATED, connection.getResponseCode());
-      Assert.assertTrue(connection.getHeaderField("Location").toString().contains("jaxrs-examples-ex03_1/services/customers/1"));
+      Assert.assertTrue(connection.getHeaderField("Location").toString().contains("jaxrs-examples-ex03_1/myservices/customers/1"));
       connection.disconnect();
 
       // Get the new customer
-      URL getUrl = new URL(baseURL + "services/customers/1");
+      URL getUrl = new URL(baseURL + "myservices/customers/1");
       connection = (HttpURLConnection) getUrl.openConnection();
       connection.setRequestMethod("GET");
       Assert.assertTrue(connection.getContentType().contains("application/xml"));

diff --git a/...ests/src/test/java/org/jboss/test/jaxrs/examples/ex03_1/services/ShoppingApplication.java b/...ests/src/test/java/org/jboss/test/jaxrs/examples/ex03_1/services/ShoppingApplication.java
@@ -26,7 +26,7 @@
 import java.util.HashSet;
 import java.util.Set;
 
-@ApplicationPath("/services")
+@ApplicationPath("/myservices")
 public class ShoppingApplication extends Application
 {
    private Set<Object> singletons = new HashSet<Object>();