Skip to content

Commit b9d784d

Browse files
mythzmythz
committed
clean up tests
1 parent 68e345f commit b9d784d

6 files changed

Lines changed: 33 additions & 41 deletions

File tree

‎src/AndroidClient/android/src/androidTest/java/net/servicestack/android/ServerEventClientTests.java‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -226,8 +226,6 @@ public void execute(ServerEventConnect e) {
226226

227227
connectMsg = Func.first(connectMsgs);
228228
joinMsg = Func.first(Func.ofType(commands, ServerEventJoin.class));
229-
230-
Utils.readToEnd(connectMsg.getUnRegisterUrl());
231229
}
232230

233231
while (commands.size() < 2) {
@@ -365,7 +363,6 @@ public void execute(ServerEventMessage e) {
365363
assertTrue(chatMsg.getId() > 0);
366364
assertEquals(info1.getUserId(), chatMsg.getFromUserId());
367365
assertEquals(info1.getDisplayName(), chatMsg.getFromName());
368-
assertEquals(info1.getDisplayName(), chatMsg.getFromName());
369366
}
370367

371368
assertEquals(1, msgs1.size());
@@ -388,7 +385,6 @@ public void execute(ServerEventMessage e) {
388385
assertTrue(chatMsg.getId() > 0);
389386
assertEquals(info2.getUserId(), chatMsg.getFromUserId());
390387
assertEquals(info2.getDisplayName(), chatMsg.getFromName());
391-
assertEquals(info2.getDisplayName(), chatMsg.getFromName());
392388
}
393389

394390
assertEquals(2, msgs1.size());
@@ -613,7 +609,7 @@ public void execute(ServerEventMessage e) {
613609
Thread.sleep(100);
614610
}
615611

616-
CustomType foo = TestGlobalReceiver.FooMethodReceived;
612+
CustomType foo = TestGlobalReceiver.CustomTypeReceived;
617613
assertNotNull(foo);
618614
assertEquals(1, foo.getId().intValue());
619615
assertEquals("Foo", foo.getName());
@@ -643,7 +639,7 @@ public void execute(ServerEventMessage e) {
643639
Thread.sleep(100);
644640
}
645641

646-
SetterType foo = TestGlobalReceiver.AnyNamedSetterReceived;
642+
SetterType foo = TestGlobalReceiver.SetterTypeReceived;
647643
assertNotNull(foo);
648644
assertEquals(1, foo.getId().intValue());
649645
assertEquals("Foo", foo.getName());

‎src/AndroidClient/android/src/androidTest/java/net/servicestack/android/TestGlobalReceiver.java‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11,18 +11,18 @@
1111
*/
1212

1313
public class TestGlobalReceiver extends ServerEventReceiver {
14-
public static CustomType FooMethodReceived;
14+
public static CustomType CustomTypeReceived;
1515
public static CustomType NoSuchMethodReceived;
1616
public static String NoSuchMethodSelector;
17-
public static SetterType AnyNamedSetterReceived;
17+
public static SetterType SetterTypeReceived;
1818

19-
public void setAnyNamedSetter(SetterType value) {
20-
AnyNamedSetterReceived = value;
19+
public void setterType(SetterType value) {
20+
SetterTypeReceived = value;
2121
}
2222

23-
public void anyNamedMethod(CustomType request)
23+
public void customType(CustomType request)
2424
{
25-
FooMethodReceived = request;
25+
CustomTypeReceived = request;
2626
}
2727

2828
@Override

‎src/AndroidClient/androidchat/androidchat.iml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,6 @@
6767
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6868
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6969
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
77-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
7870
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
7971
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
8072
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -83,6 +75,14 @@
8375
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
8476
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
8577
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
85+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8686
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/assets" />
8787
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8888
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />

‎src/AndroidClient/app/app.iml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,6 @@
6767
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6868
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6969
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
77-
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
7870
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
7971
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
8072
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
@@ -83,6 +75,14 @@
8375
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
8476
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
8577
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/aidl" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/java" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
85+
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
8686
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8787
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8888
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />

‎src/AndroidClient/client/src/test/java/net/servicestack/client/ServerEventClientTests.java‎

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -160,8 +160,6 @@ public void test_Does_fire_all_callbacks() throws Exception {
160160

161161
connectMsg = Func.first(connectMsgs);
162162
joinMsg = Func.first(Func.ofType(commands, ServerEventJoin.class));
163-
164-
Utils.readToEnd(connectMsg.getUnRegisterUrl());
165163
}
166164

167165
while (commands.size() < 2) {
@@ -273,7 +271,6 @@ public void test_Does_receive_messages() throws Exception {
273271
assertTrue(chatMsg.getId() > 0);
274272
assertEquals(info1.getUserId(), chatMsg.getFromUserId());
275273
assertEquals(info1.getDisplayName(), chatMsg.getFromName());
276-
assertEquals(info1.getDisplayName(), chatMsg.getFromName());
277274
}
278275

279276
assertEquals(1, msgs1.size());
@@ -296,7 +293,6 @@ public void test_Does_receive_messages() throws Exception {
296293
assertTrue(chatMsg.getId() > 0);
297294
assertEquals(info2.getUserId(), chatMsg.getFromUserId());
298295
assertEquals(info2.getDisplayName(), chatMsg.getFromName());
299-
assertEquals(info2.getDisplayName(), chatMsg.getFromName());
300296
}
301297

302298
assertEquals(2, msgs1.size());
@@ -504,7 +500,7 @@ public void test_Does_set_properties_on_global_receiver() throws Exception {
504500
Thread.sleep(100);
505501
}
506502

507-
SetterType foo = TestGlobalReceiver.AnyNamedSetterReceived;
503+
SetterType foo = TestGlobalReceiver.SetterTypeReceived;
508504
assertNotNull(foo);
509505
assertEquals(1, foo.getId().intValue());
510506
assertEquals("Foo", foo.getName());

‎src/AndroidClient/techstacks/techstacks.iml‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -67,14 +67,6 @@
6767
<sourceFolder url="file://$MODULE_DIR$/src/main/jni" isTestSource="false" />
6868
<sourceFolder url="file://$MODULE_DIR$/src/main/rs" isTestSource="false" />
6969
<sourceFolder url="file://$MODULE_DIR$/src/main/shaders" isTestSource="false" />
70-
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
71-
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
72-
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
73-
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
74-
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
75-
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
76-
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
77-
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
7870
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/res" type="java-test-resource" />
7971
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/resources" type="java-test-resource" />
8072
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/assets" type="java-test-resource" />
@@ -83,6 +75,14 @@
8375
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/jni" isTestSource="true" />
8476
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/rs" isTestSource="true" />
8577
<sourceFolder url="file://$MODULE_DIR$/src/androidTest/shaders" isTestSource="true" />
78+
<sourceFolder url="file://$MODULE_DIR$/src/test/res" type="java-test-resource" />
79+
<sourceFolder url="file://$MODULE_DIR$/src/test/resources" type="java-test-resource" />
80+
<sourceFolder url="file://$MODULE_DIR$/src/test/assets" type="java-test-resource" />
81+
<sourceFolder url="file://$MODULE_DIR$/src/test/aidl" isTestSource="true" />
82+
<sourceFolder url="file://$MODULE_DIR$/src/test/java" isTestSource="true" />
83+
<sourceFolder url="file://$MODULE_DIR$/src/test/jni" isTestSource="true" />
84+
<sourceFolder url="file://$MODULE_DIR$/src/test/rs" isTestSource="true" />
85+
<sourceFolder url="file://$MODULE_DIR$/src/test/shaders" isTestSource="true" />
8686
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/blame" />
8787
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/classes" />
8888
<excludeFolder url="file://$MODULE_DIR$/build/intermediates/dependency-cache" />

0 commit comments

Comments
 (0)