Move tests into test folder

Author: mythz

src/AndroidClient/client/src/main/java/net/servicestack/client/sse/ServerEventsClient.java

@@ -148,12 +148,16 @@ public void setHandlers(Map<String, ServerEventCallback> handlers) {
         this.handlers = handlers;
     }
 
+    public ServerEventsClient registerHandler(String name, ServerEventCallback handler){
+        this.handlers.put(name, handler);
+        return this;
+    }
+
     public Map<String, ServerEventCallback> getNamedReceivers() {
         return namedReceivers;
     }
 
-    public ServerEventsClient setNamedReceivers(Map<String, ServerEventCallback> namedReceivers) {
-        this.namedReceivers = namedReceivers;
+    public ServerEventsClient registerNamedReceiver(String name, Class<?> namedReceiverClass) {
         return this;
     }
 
@@ -233,6 +237,21 @@ public synchronized void stop(){
         internalStop();
     }
 
+    public ServerEventsClient waitTillConnected() throws Exception {
+        return waitTillConnected(Integer.MAX_VALUE);
+    }
+
+    public ServerEventsClient waitTillConnected(int timeoutMs) throws Exception {
+        Date startedAt = new Date();
+        while (connectionInfo == null) {
+            Thread.sleep(50);
+
+            if ((new Date().getTime() - startedAt.getTime()) > timeoutMs)
+                throw new TimeoutException("Not connected after " + timeoutMs + "ms");
+        }
+        return this;
+    }
+
     private synchronized void internalStop() {
         if (Log.isDebugEnabled())
             Log.d("Stop() " + getConnectionDisplayName());

…servicestack/client/tests/GsonTests.java …client/src/test/java/test/GsonTests.javasrc/AndroidClient/client/src/test/java/net/servicestack/client/tests/GsonTests.java renamed to src/AndroidClient/client/src/test/java/test/GsonTests.java src/AndroidClient/client/src/test/java/net/servicestack/client/tests/GsonTests.java renamed to src/AndroidClient/client/src/test/java/test/GsonTests.java

@@ -1,14 +1,14 @@
 //  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
 
-package net.servicestack.client.tests;
+package test;
 
 import com.google.gson.Gson;
 
 import java.util.ArrayList;
 import java.util.List;
 
 import junit.framework.TestCase;
-import net.servicestack.client.tests.dto.*;
+import test.dto.*;
 
 public class GsonTests extends TestCase {
 

…client/tests/JsonServiceClientTests.java …st/java/test/JsonServiceClientTests.javasrc/AndroidClient/client/src/test/java/net/servicestack/client/tests/JsonServiceClientTests.java renamed to src/AndroidClient/client/src/test/java/test/JsonServiceClientTests.java src/AndroidClient/client/src/test/java/net/servicestack/client/tests/JsonServiceClientTests.java renamed to src/AndroidClient/client/src/test/java/test/JsonServiceClientTests.java

@@ -1,6 +1,6 @@
 //  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
 
-package net.servicestack.client.tests;
+package test;
 
 import junit.framework.TestCase;
 import net.servicestack.client.ConnectionFilter;

…servicestack/client/tests/JsonTests.java …client/src/test/java/test/JsonTests.javasrc/AndroidClient/client/src/test/java/net/servicestack/client/tests/JsonTests.java renamed to src/AndroidClient/client/src/test/java/test/JsonTests.java src/AndroidClient/client/src/test/java/net/servicestack/client/tests/JsonTests.java renamed to src/AndroidClient/client/src/test/java/test/JsonTests.java

@@ -1,17 +1,15 @@
 //  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
 
-package net.servicestack.client.tests;
+package test;
 
 import junit.framework.TestCase;
 
 import net.servicestack.client.JsonServiceClient;
-import net.servicestack.client.Log;
 import net.servicestack.client.TimeSpan;
 import net.servicestack.client.Utils;
 
 import java.io.UnsupportedEncodingException;
 import java.net.URLEncoder;
-import java.util.Date;
 
 public class JsonTests extends TestCase {
     public JsonTests() {

…client/tests/ServerEventClientTests.java …st/java/test/ServerEventClientTests.javasrc/AndroidClient/client/src/test/java/net/servicestack/client/tests/ServerEventClientTests.java renamed to src/AndroidClient/client/src/test/java/test/ServerEventClientTests.java src/AndroidClient/client/src/test/java/net/servicestack/client/tests/ServerEventClientTests.java renamed to src/AndroidClient/client/src/test/java/test/ServerEventClientTests.java

@@ -1,4 +1,4 @@
-package net.servicestack.client.tests;
+package test;
 
 import junit.framework.TestCase;
 
@@ -18,7 +18,9 @@
 import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import static chat.chatdtos.*;
+import static chat.chatdtos.ChatMessage;
+import static chat.chatdtos.PostChatToChannel;
+import static chat.chatdtos.ResetServerEvents;
 
 /**
  * Created by mythz on 2/10/2017.
@@ -325,4 +327,62 @@ public void test_Does_reconnect_on_lost_connection() throws Exception {
             assertEquals("msg2 from client2", chatMsg2.getMessage());
         }
     }
+
+    public void test_Does_send_message_to_Handler() throws Exception {
+
+        List<ChatMessage> chatMsgs = new ArrayList<>();
+
+        try(ServerEventsClient client1 = new ServerEventsClient("http://chat.servicestack.net")
+                .registerHandler("chat", (client, e) -> {
+                    ChatMessage chatMsg = JsonUtils.fromJson(e.getJson(), ChatMessage.class);
+                    chatMsgs.add(chatMsg);
+                })
+                .start()
+                .waitTillConnected()) {
+
+            postChat(client1, "msg1");
+
+            while (chatMsgs.size() < 1){
+                Thread.sleep(100);
+            }
+
+            ChatMessage chatMsg = Func.last(chatMsgs);
+            assertEquals("msg1", chatMsg.getMessage());
+
+            postChat(client1, "msg2");
+
+            while (chatMsgs.size() < 2){
+                Thread.sleep(100);
+            }
+
+            chatMsg = Func.last(chatMsgs);
+            assertEquals("msg2", chatMsg.getMessage());
+        }
+    }
+
+    public void test_Does_send_message_to_named_receiver() throws Exception {
+//        try(ServerEventsClient client1 = new ServerEventsClient("http://chat.servicestack.net")
+//                .registerNamedReceiver("test", TestNamedReceiver.class)
+//                .start()
+//                .waitTillConnected()) {
+//
+//            postChat(client1, "msg1");
+//
+//            while (chatMsgs.size() < 1){
+//                Thread.sleep(100);
+//            }
+//
+//            ChatMessage chatMsg = Func.last(chatMsgs);
+//            assertEquals("msg1", chatMsg.getMessage());
+//
+//            postChat(client1, "msg2");
+//
+//            while (chatMsgs.size() < 2){
+//                Thread.sleep(100);
+//            }
+//
+//            chatMsg = Func.last(chatMsgs);
+//            assertEquals("msg2", chatMsg.getMessage());
+//        }
+    }
 }

…client/tests/TechStacksServiceTests.java …st/java/test/TechStacksServiceTests.javasrc/AndroidClient/client/src/test/java/net/servicestack/client/tests/TechStacksServiceTests.java renamed to src/AndroidClient/client/src/test/java/test/TechStacksServiceTests.java src/AndroidClient/client/src/test/java/net/servicestack/client/tests/TechStacksServiceTests.java renamed to src/AndroidClient/client/src/test/java/test/TechStacksServiceTests.java

@@ -1,4 +1,4 @@
-package net.servicestack.client.tests;
+package test;
 
 import junit.framework.TestCase;
 import net.servicestack.client.JsonServiceClient;

…icestack/client/tests/TestAuthTests.java …nt/src/test/java/test/TestAuthTests.javasrc/AndroidClient/client/src/test/java/net/servicestack/client/tests/TestAuthTests.java renamed to src/AndroidClient/client/src/test/java/test/TestAuthTests.java src/AndroidClient/client/src/test/java/net/servicestack/client/tests/TestAuthTests.java renamed to src/AndroidClient/client/src/test/java/test/TestAuthTests.java

@@ -1,13 +1,11 @@
-package net.servicestack.client.tests;
+package test;
 
 import junit.framework.TestCase;
 
 import net.servicestack.client.JsonServiceClient;
 import net.servicestack.client.ServiceClient;
 import net.servicestack.client.WebServiceException;
 
-import net.servicestack.client.tests.testdtos.*;
-
 /**
  * Created by mythz on 1/3/2016.
  */
@@ -20,7 +18,7 @@ public JsonServiceClient CreateClient(){
     public void test_AuthRequired_returns_401(){
         try {
             ServiceClient client = CreateClient();
-            client.get(new TestAuth());
+            client.get(new testdtos.TestAuth());
             fail("should throw");
         } catch (WebServiceException ex){
             assertEquals(401, ex.getStatusCode());
@@ -33,7 +31,7 @@ public void test_does_send_BasicAuthHeaders(){
         client.setCredentials("test", "test");
         client.setAlwaysSendBasicAuthHeaders(true);
 
-        TestAuthResponse response = client.get(new TestAuth());
+        testdtos.TestAuthResponse response = client.get(new testdtos.TestAuth());
 
         assertEquals("1", response.getUserId());
         assertEquals("test", response.getUserName());
@@ -45,7 +43,7 @@ public void test_does_transparently_send_BasicAuthHeader_on_401_response(){
         ServiceClient client = CreateClient();
         client.setCredentials("test", "test");
 
-        TestAuthResponse response = client.get(new TestAuth());
+        testdtos.TestAuthResponse response = client.get(new testdtos.TestAuth());
 
         assertEquals("1", response.getUserId());
         assertEquals("test", response.getUserName());
@@ -56,7 +54,7 @@ public void test_does_transparently_send_BasicAuthHeader_on_401_response(){
     public void test_can_authenticate_with_CredentialsAuth(){
         ServiceClient client = CreateClient();
 
-        AuthenticateResponse authResponse = client.post(new Authenticate()
+        testdtos.AuthenticateResponse authResponse = client.post(new testdtos.Authenticate()
             .setProvider("credentials")
             .setUserName("test")
             .setPassword("test"));
@@ -65,7 +63,7 @@ public void test_can_authenticate_with_CredentialsAuth(){
         assertEquals("test", authResponse.getUserName());
         assertNotNull(authResponse.getSessionId());
 
-        TestAuthResponse response = client.get(new TestAuth());
+        testdtos.TestAuthResponse response = client.get(new testdtos.TestAuth());
 
         assertEquals("1", response.getUserId());
         assertEquals("test", response.getUserName());

…ient/tests/TestInterfaceMarkerTests.java …/java/test/TestInterfaceMarkerTests.javasrc/AndroidClient/client/src/test/java/net/servicestack/client/tests/TestInterfaceMarkerTests.java renamed to src/AndroidClient/client/src/test/java/test/TestInterfaceMarkerTests.java src/AndroidClient/client/src/test/java/net/servicestack/client/tests/TestInterfaceMarkerTests.java renamed to src/AndroidClient/client/src/test/java/test/TestInterfaceMarkerTests.java

@@ -1,4 +1,4 @@
-package net.servicestack.client.tests;
+package test;
 
 import junit.framework.TestCase;
 import net.servicestack.client.HttpMethods;

src/AndroidClient/client/src/test/java/test/TestNamedReceiver.java

@@ -0,0 +1,52 @@
+package test;
+
+import net.servicestack.client.JsonUtils;
+import net.servicestack.client.sse.ServerEventMessage;
+
+/**
+ * Created by mythz on 2/11/2017.
+ */
+
+public class TestNamedReceiver {
+
+    public class CustomType {
+        private int id;
+        private String name;
+
+        public int getId() {
+            return id;
+        }
+
+        public void setId(int id) {
+            this.id = id;
+        }
+
+        public String getName() {
+            return name;
+        }
+
+        public void setName(String name) {
+            this.name = name;
+        }
+    }
+
+    public static CustomType FooMethodReceived;
+    public static CustomType BarMethodReceived;
+    public static CustomType NoSuchMethodReceived;
+    public static String NoSuchMethodSelector;
+
+    public void FooMethod(CustomType request) {
+        FooMethodReceived = request;
+    }
+
+    public CustomType BarMethod(CustomType request) {
+        BarMethodReceived = request;
+        return request;
+    }
+
+    public void NoSuchMethod(String selector, Object message) {
+        ServerEventMessage msg = (ServerEventMessage)message;
+        NoSuchMethodReceived = JsonUtils.fromJson(msg.getJson(), CustomType.class);
+        NoSuchMethodSelector = selector;
+    }
+}

…stack/client/tests/TestServiceTests.java …src/test/java/test/TestServiceTests.javasrc/AndroidClient/client/src/test/java/net/servicestack/client/tests/TestServiceTests.java renamed to src/AndroidClient/client/src/test/java/test/TestServiceTests.java src/AndroidClient/client/src/test/java/net/servicestack/client/tests/TestServiceTests.java renamed to src/AndroidClient/client/src/test/java/test/TestServiceTests.java

@@ -1,11 +1,11 @@
 //  Copyright (c) 2015 ServiceStack LLC. All rights reserved.
 
-package net.servicestack.client.tests;
+package test;
 
 import io.techstacks.dto;
 import junit.framework.TestCase;
 import net.servicestack.client.*;
-import net.servicestack.client.tests.testdtos.*;
+import test.testdtos.*;
 
 import java.io.IOException;
 import java.io.InputStream;