Fixed and improved tests for jaxrs client and singleton due to TomEE failures.

Author: radcortez

jaxrs/jaxrs-client/src/test/java/org/javaee7/jaxrs/client/MyResourceTest.java

@@ -2,10 +2,15 @@
 
 import static org.junit.Assert.assertEquals;
 
+import java.io.StringReader;
 import java.net.MalformedURLException;
 import java.net.URI;
 import java.net.URL;
 
+import javax.json.Json;
+import javax.json.JsonArray;
+import javax.json.JsonObject;
+import javax.json.JsonReader;
 import javax.ws.rs.client.Client;
 import javax.ws.rs.client.ClientBuilder;
 import javax.ws.rs.client.Entity;
@@ -132,7 +137,15 @@ public void test4Delete() {
     @Test
     public void test5ClientSideNegotiation() {
         String json = target.request().accept(MediaType.APPLICATION_JSON).get(String.class);
-        assertEquals("[{\"name\":\"Penny\",\"age\":1},{\"name\":\"Leonard\",\"age\":2},{\"name\":\"Sheldon\",\"age\":3}]", json);
+
+        JsonReader reader = Json.createReader(new StringReader(json));
+        JsonArray jsonArray = reader.readArray();
+        assertEquals(1, jsonArray.getJsonObject(0).getInt("age"));
+        assertEquals("Penny", jsonArray.getJsonObject(0).getString("name"));
+        assertEquals(2, jsonArray.getJsonObject(1).getInt("age"));
+        assertEquals("Leonard", jsonArray.getJsonObject(1).getString("name"));
+        assertEquals(3, jsonArray.getJsonObject(2).getInt("age"));
+        assertEquals("Sheldon", jsonArray.getJsonObject(2).getString("name"));
     }
 
     @Test

jaxrs/singleton/src/main/java/org/javaee7/jaxrs/singleton/AnnotatedSingletonResource.java

@@ -21,11 +21,10 @@
 public class AnnotatedSingletonResource {
     // Ideally this state should be stored in a database
     // But this is a singleton resource and so state can be saved here too
-    List<String> strings;
+    private List<String> strings;
 
     public AnnotatedSingletonResource() {
         strings = new ArrayList<>();
-        System.out.println("******* init");
     }
 
     @GET

jaxrs/singleton/src/main/java/org/javaee7/jaxrs/singleton/ApplicationSingletonResource.java

@@ -1,16 +1,9 @@
 package org.javaee7.jaxrs.singleton;
 
+import javax.ws.rs.*;
+import javax.ws.rs.core.MediaType;
 import java.util.ArrayList;
 import java.util.List;
-import javax.ws.rs.Consumes;
-import javax.ws.rs.DELETE;
-import javax.ws.rs.GET;
-import javax.ws.rs.POST;
-import javax.ws.rs.PUT;
-import javax.ws.rs.Path;
-import javax.ws.rs.PathParam;
-import javax.ws.rs.Produces;
-import javax.ws.rs.core.MediaType;
 
 /**
  * @author Arun Gupta
@@ -19,7 +12,7 @@
 public class ApplicationSingletonResource {
     // Ideally this state should be stored in a database
     // But this is a singleton resource and so state can be saved here too
-    List<String> strings;
+    private List<String> strings;
 
     public ApplicationSingletonResource() {
         strings = new ArrayList<>();

jaxrs/singleton/src/main/java/org/javaee7/jaxrs/singleton/MyAnnotatedApplication.java

@@ -7,5 +7,4 @@
  * @author Arun Gupta
  */
 @ApplicationPath("webresources")
-public class MyAnnotatedApplication extends Application {
-}
+public class MyAnnotatedApplication extends Application {}

jaxrs/singleton/src/main/java/org/javaee7/jaxrs/singleton/MyApplication.java

@@ -9,7 +9,6 @@
  */
 @ApplicationPath("webresources")
 public class MyApplication extends Application {
-
     @Override
     public Set<Object> getSingletons() {
         Set<Object> resources = new java.util.HashSet<>();

jaxrs/singleton/src/test/java/org/javaee7/jaxrs/singleton/AnnotatedSingletonResourceTest.java

@@ -1,64 +1,60 @@
 package org.javaee7.jaxrs.singleton;
 
-import static org.junit.Assert.assertEquals;
-
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.util.StringTokenizer;
-
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.WebTarget;
-
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.junit.InSequence;
 import org.jboss.arquillian.test.api.ArquillianResource;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.junit.runners.MethodSorters;
+
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.WebTarget;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
+import java.util.StringTokenizer;
+
+import static org.junit.Assert.assertEquals;
 
 /**
  * @author Arun Gupta
  */
 @RunWith(Arquillian.class)
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class AnnotatedSingletonResourceTest {
-
     @ArquillianResource
     private URL base;
 
-    Client client;
-    WebTarget target;
+    private Client client;
+    private WebTarget target;
 
     @Before
     public void setUp() throws MalformedURLException {
         client = ClientBuilder.newClient();
         target = client.target(URI.create(new URL(base, "webresources/annotated").toExternalForm()));
-//        target = client.target("http://localhost:8080/singleton/webresources/annotated");
     }
 
     @After
     public void tearDown() {
         client.close();
     }
 
-    @Deployment(testable=false)
+    @Deployment(testable = false)
     public static WebArchive createDeployment() {
         return ShrinkWrap.create(WebArchive.class)
-                .addClasses(
-                        MyAnnotatedApplication.class, 
-                        AnnotatedSingletonResource.class);
+                         .addClasses(
+                                 MyAnnotatedApplication.class,
+                                 AnnotatedSingletonResource.class);
     }
 
     @Test
-    public void test1Post() {
+    @InSequence(1)
+    public void testPost() {
         target.request().post(Entity.text("pineapple"));
         target.request().post(Entity.text("mango"));
         target.request().post(Entity.text("kiwi"));
@@ -71,13 +67,15 @@ public void test1Post() {
     }
 
     @Test
-    public void test2Get() {
+    @InSequence(2)
+    public void testGet() {
         String response = target.path("2").request().get(String.class);
         assertEquals("kiwi", response);
     }
 
     @Test
-    public void test3Delete() {
+    @InSequence(3)
+    public void testDelete() {
         target.path("kiwi").request().delete();
 
         String list = target.request().get(String.class);
@@ -86,12 +84,12 @@ public void test3Delete() {
     }
 
     @Test
-    public void test4Put() {
+    @InSequence(4)
+    public void testPut() {
         target.request().put(Entity.text("apple"));
 
         String list = target.request().get(String.class);
         StringTokenizer tokens = new StringTokenizer(list, ",");
         assertEquals(4, tokens.countTokens());
     }
-
 }

jaxrs/singleton/src/test/java/org/javaee7/jaxrs/singleton/ApplicationSingletonResourceTest.java

@@ -1,41 +1,37 @@
 package org.javaee7.jaxrs.singleton;
 
-import static org.junit.Assert.assertEquals;
-
-import java.net.MalformedURLException;
-import java.net.URI;
-import java.net.URL;
-import java.util.StringTokenizer;
-
-import javax.ws.rs.client.Client;
-import javax.ws.rs.client.ClientBuilder;
-import javax.ws.rs.client.Entity;
-import javax.ws.rs.client.WebTarget;
-
 import org.jboss.arquillian.container.test.api.Deployment;
 import org.jboss.arquillian.junit.Arquillian;
+import org.jboss.arquillian.junit.InSequence;
 import org.jboss.arquillian.test.api.ArquillianResource;
 import org.jboss.shrinkwrap.api.ShrinkWrap;
 import org.jboss.shrinkwrap.api.spec.WebArchive;
 import org.junit.After;
 import org.junit.Before;
-import org.junit.FixMethodOrder;
 import org.junit.Test;
 import org.junit.runner.RunWith;
-import org.junit.runners.MethodSorters;
+
+import javax.ws.rs.client.Client;
+import javax.ws.rs.client.ClientBuilder;
+import javax.ws.rs.client.Entity;
+import javax.ws.rs.client.WebTarget;
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URL;
+import java.util.StringTokenizer;
+
+import static org.junit.Assert.assertEquals;
 
 /**
  * @author Arun Gupta
  */
 @RunWith(Arquillian.class)
-@FixMethodOrder(MethodSorters.NAME_ASCENDING)
 public class ApplicationSingletonResourceTest {
-
     @ArquillianResource
     private URL base;
 
-    Client client;
-    WebTarget target;
+    private Client client;
+    private WebTarget target;
 
     @Before
     public void setUp() throws MalformedURLException {
@@ -51,13 +47,14 @@ public void tearDown() {
     @Deployment(testable = false)
     public static WebArchive createDeployment() {
         return ShrinkWrap.create(WebArchive.class)
-                .addClasses(
-                        MyApplication.class,
-                        ApplicationSingletonResource.class);
+                         .addClasses(
+                                 MyApplication.class,
+                                 ApplicationSingletonResource.class);
     }
 
     @Test
-    public void test1Post() {
+    @InSequence(1)
+    public void testPost() {
         target.request().post(Entity.text("pineapple"));
         target.request().post(Entity.text("mango"));
         target.request().post(Entity.text("kiwi"));
@@ -69,13 +66,15 @@ public void test1Post() {
     }
 
     @Test
-    public void test2Get() {
+    @InSequence(2)
+    public void testGet() {
         String response = target.path("2").request().get(String.class);
         assertEquals("kiwi", response);
     }
 
     @Test
-    public void test3Delete() {
+    @InSequence(3)
+    public void testDelete() {
         target.path("kiwi").request().delete();
 
         String list = target.request().get(String.class);
@@ -84,12 +83,12 @@ public void test3Delete() {
     }
 
     @Test
-    public void test4Put() {
+    @InSequence(4)
+    public void testPut() {
         target.request().put(Entity.text("apple"));
 
         String list = target.request().get(String.class);
         StringTokenizer tokens = new StringTokenizer(list, ",");
         assertEquals(4, tokens.countTokens());
     }
-
 }