Fixing wrong test

jbossws · Nov 21, 2017 · a9b1d2c · a9b1d2c
1 parent bbe0108
commit a9b1d2c
Showing 1 changed file with 48 additions and 22 deletions.
diff --git a/...d-rest-tests/src/test/java/org/jboss/test/jaxrs/examples/ex10_1/CustomerResourceTest.java b/...d-rest-tests/src/test/java/org/jboss/test/jaxrs/examples/ex10_1/CustomerResourceTest.java
@@ -71,24 +71,31 @@ public void testQueryCustomers() throws Exception
    {
       URI uri = new URI(baseURL + "services/customers?start=0&size=5");
       Client client = ClientBuilder.newClient();
-      StringBuilder sb = new StringBuilder();
       try {
-         while (uri != null)
-         {
-            WebTarget target = client.target(uri);
-            String output = target.request().get(String.class);
-            sb.append(output);
-
-            Customers customers = target.request().get(Customers.class);
-            uri = customers.getNext();
-         }
-         String s = sb.toString();
+         WebTarget target = client.target(uri);
+         String s = target.request().get(String.class);
+
          Assert.assertTrue(s.contains("Bill"));
          Assert.assertTrue(s.contains("Joe"));
          Assert.assertTrue(s.contains("Monica"));
          Assert.assertTrue(s.contains("Steve"));
          Assert.assertTrue(s.contains("Rod"));
          Assert.assertFalse(s.contains("Bob"));
+
+         Customers customers = target.request().get(Customers.class);
+         uri = customers.getNext();
+         target = client.target(uri);
+         s = target.request().get(String.class);
+
+         Assert.assertFalse(s.contains("Bill"));
+         Assert.assertFalse(s.contains("Joe"));
+         Assert.assertFalse(s.contains("Monica"));
+         Assert.assertFalse(s.contains("Steve"));
+         Assert.assertFalse(s.contains("Rod"));
+         Assert.assertTrue(s.contains("Bob"));
+
+         customers = target.request().get(Customers.class);
+         Assert.assertNull(customers.getNext());
       } finally {
          client.close();
       }
@@ -100,24 +107,43 @@ public void testQueryCustomers2() throws Exception
    {
       URI uri = new URI(baseURL + "services/customers");
       Client client = ClientBuilder.newClient();
-      StringBuilder sb = new StringBuilder();
       try {
-         while (uri != null)
-         {
-            WebTarget target = client.target(uri);
-            String output = target.request().get(String.class);
-            sb.append(output);
-
-            Customers customers = target.request().get(Customers.class);
-            uri = customers.getNext();
-         }
-         String s = sb.toString();
+         WebTarget target = client.target(uri);
+         String s = target.request().get(String.class);
+
          Assert.assertTrue(s.contains("Bill"));
          Assert.assertTrue(s.contains("Joe"));
          Assert.assertFalse(s.contains("Monica"));
          Assert.assertFalse(s.contains("Steve"));
          Assert.assertFalse(s.contains("Rod"));
          Assert.assertFalse(s.contains("Bob"));
+
+         Customers customers = target.request().get(Customers.class);
+         uri = customers.getNext();
+         target = client.target(uri);
+         s = target.request().get(String.class);
+
+         Assert.assertFalse(s.contains("Bill"));
+         Assert.assertFalse(s.contains("Joe"));
+         Assert.assertTrue(s.contains("Monica"));
+         Assert.assertTrue(s.contains("Steve"));
+         Assert.assertFalse(s.contains("Rod"));
+         Assert.assertFalse(s.contains("Bob"));
+
+         customers = target.request().get(Customers.class);
+         uri = customers.getNext();
+         target = client.target(uri);
+         s = target.request().get(String.class);
+
+         Assert.assertFalse(s.contains("Bill"));
+         Assert.assertFalse(s.contains("Joe"));
+         Assert.assertFalse(s.contains("Monica"));
+         Assert.assertFalse(s.contains("Steve"));
+         Assert.assertTrue(s.contains("Rod"));
+         Assert.assertTrue(s.contains("Bob"));
+
+         customers = target.request().get(Customers.class);
+         Assert.assertNull(customers.getNext());
       } finally {
          client.close();
       }