Changes in src/test/java/geniusweb/clienttest/JavaClientTest.java [3:1]

File:

• src/test/java/geniusweb/clienttest/JavaClientTest.java (modified) (6 diffs)

src/test/java/geniusweb/clienttest/JavaClientTest.java

@@ -5 +5 @@
 
 import java.io.IOException;
-import java.util.HashMap;
 import java.util.LinkedList;
 import java.util.List;
-import java.util.Map;
 
 import org.junit.AfterClass;
@@ -15 +13 @@
 import org.python.util.PythonInterpreter;
 
-import com.fasterxml.jackson.core.type.TypeReference;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import com.neovisionaries.ws.client.WebSocket;
 import com.neovisionaries.ws.client.WebSocketAdapter;
@@ -60 +56 @@
         @Test
         public void clientSmokeTest() throws IOException {
-                WebSocketFactory factory = new WebSocketFactory().setConnectionTimeout(5000);
-                WebSocket ws = factory.createSocket("ws://localhost:8080/profilesserver/websocket/liststream");
+                WebSocketFactory factory = new WebSocketFactory()
+                                .setConnectionTimeout(5000);
+                WebSocket ws = factory.createSocket(
+                                "ws://localhost:8080/profilesserver/websocket/liststream");
         }
 
         @Test
-        public void testGetList() throws IOException, InterruptedException, WebSocketException {
+        public void testGetList()
+                        throws IOException, InterruptedException, WebSocketException {
                 final List<String> received = new LinkedList<>();
                 Thread.sleep(5000);
-                WebSocketFactory factory = new WebSocketFactory().setConnectionTimeout(20000);
-                WebSocket ws = factory.createSocket("ws://localhost:8080/profilesserver/websocket/liststream");
+                WebSocketFactory factory = new WebSocketFactory()
+                                .setConnectionTimeout(20000);
+                WebSocket ws = factory.createSocket(
+                                "ws://localhost:8080/profilesserver/websocket/liststream");
 
                 ws.addListener(new WebSocketAdapter() {
                         @Override
-                        public void onTextMessage(WebSocket websocket, String message) throws Exception {
+                        public void onTextMessage(WebSocket websocket, String message)
+                                        throws Exception {
                                 System.out.println("received message: " + message);
                                 received.add(message);
@@ -82 +84 @@
 
                 Thread.sleep(2000);
-
-                assertEquals(1, received.size()); // 1 answer received
-
-                ObjectMapper mapper = new ObjectMapper();
-                TypeReference<HashMap<String, Object>> typeRef = new TypeReference<HashMap<String, Object>>() {
-                };
-                Map<String, Object> map = mapper.readValue(received.get(0), typeRef);
-
-                List<String> domains= new LinkedList<>();
-                for (String key: map.keySet()) {
-                        domains.add(key.substring(key.indexOf("get")));
-                        }
-                assertTrue(domains.contains("get/jobs"));
-                assertTrue(domains.contains("get/7issues"));
+                assertEquals(1, received.size());
+                assertTrue(received.get(0).matches(JSON));
+                System.out.println(JSON);
         }
 
         @Test
-        public void testExample() throws WebSocketException, InterruptedException, IOException {
+        public void testExample()
+                        throws WebSocketException, InterruptedException, IOException {
                 DownloadProfileExample test = new DownloadProfileExample();
                 test.run();
@@ -106 +98 @@
 
         @Test
-        public void testExample2() throws WebSocketException, InterruptedException, IOException {
+        public void testExample2()
+                        throws WebSocketException, InterruptedException, IOException {
                 DownloadProfileExample2 test = new DownloadProfileExample2();
                 assertEquals(JOBS1PROFILE, test.getReceived());
@@ -119 +112 @@
 
                 // Create factory and coerce Jython calculator object
-                JythonObjectFactory factory = new JythonObjectFactory(WebSocketAdapter.class, "PythonDownloadProfile",
+                JythonObjectFactory factory = new JythonObjectFactory(
+                                WebSocketAdapter.class, "PythonDownloadProfile",
                                 "PythonDownloadProfile");
                 factory.createObject();