Skip to content

Commit f60c9b1

Browse files
mythzmythz
committed
refactor ServerEventTests to use shared factory method
1 parent d22ed1d commit f60c9b1

File tree

1 file changed

+35
-31
lines changed

1 file changed

+35
-31
lines changed

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

Lines changed: 35 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -34,10 +34,14 @@ public ServerEventClientTests() {
3434
Log.setInstance(new LogProvider("", true));
3535
}
3636

37+
public ServerEventsClient createServerEventsClient(String baseUrl, String... channels){
38+
return new ServerEventsClient(baseUrl, channels);
39+
}
40+
3741
public void test_Can_connect_to_ServerEventsStream() throws Exception {
3842
final CountDownLatch signal = new CountDownLatch(1);
3943

40-
try (ServerEventsClient client = new ServerEventsClient("http://chat.servicestack.net", "home")
44+
try (ServerEventsClient client = createServerEventsClient("http://chat.servicestack.net", "home")
4145
.setOnConnect(e -> {
4246
System.out.print("onConnect: " + e);
4347
signal.countDown();
@@ -50,7 +54,7 @@ public void test_Can_connect_to_ServerEventsStream() throws Exception {
5054
public void test_Does_fire_onJoin_events() throws Exception {
5155
final CountDownLatch signal = new CountDownLatch(1);
5256

53-
try(ServerEventsClient client = new ServerEventsClient("http://chat.servicestack.net", "home"))
57+
try(ServerEventsClient client = createServerEventsClient("http://chat.servicestack.net", "home"))
5458
{
5559
client
5660
.setOnConnect(e -> {
@@ -75,7 +79,7 @@ public void test_Does_fire_onJoin_events_for_multiple_Channels() throws Exceptio
7579
String[] channels = new String[] { "A", "B", "C" };
7680
List<ServerEventJoin> joinMsgs = new ArrayList<>();
7781

78-
try (ServerEventsClient client = new ServerEventsClient("http://chat.servicestack.net", channels))
82+
try (ServerEventsClient client = createServerEventsClient("http://chat.servicestack.net", channels))
7983
{
8084
client
8185
.setOnCommand(e -> {
@@ -101,7 +105,7 @@ public void test_Does_fire_onJoin_events_for_multiple_Channels() throws Exceptio
101105
private void clearPreviousRun(String[] channels) throws Exception {
102106
final CountDownLatch signal = new CountDownLatch(1);
103107

104-
try (ServerEventsClient client = new ServerEventsClient("http://chat.servicestack.net", channels)
108+
try (ServerEventsClient client = createServerEventsClient("http://chat.servicestack.net", channels)
105109
.setOnConnect(e -> {
106110
signal.countDown();
107111
})
@@ -123,7 +127,7 @@ public void test_Does_fire_all_callbacks() throws Exception {
123127
List<ServerEventMessage> commands = new ArrayList<>();
124128
List<Exception> errors = new ArrayList<>();
125129

126-
try(ServerEventsClient client1 = new ServerEventsClient("http://chat.servicestack.net")
130+
try(ServerEventsClient client1 = createServerEventsClient("http://chat.servicestack.net")
127131
.setOnConnect(connectMsgs::add)
128132
.setOnCommand(commands::add)
129133
.setOnMessage(msgs::add)
@@ -146,7 +150,7 @@ public void test_Does_fire_all_callbacks() throws Exception {
146150
connectMsgs.clear();
147151
commands.clear();
148152

149-
try(ServerEventsClient client2 = new ServerEventsClient("http://chat.servicestack.net")
153+
try(ServerEventsClient client2 = createServerEventsClient("http://chat.servicestack.net")
150154
.setOnConnect(connectMsgs::add)
151155
.start())
152156
{
@@ -226,12 +230,12 @@ public void test_Does_receive_messages() throws Exception {
226230
List<ServerEventMessage> msgs2 = new ArrayList<>();
227231

228232
try (
229-
ServerEventsClient client1 = new ServerEventsClient("http://chat.servicestack.net")
233+
ServerEventsClient client1 = createServerEventsClient("http://chat.servicestack.net")
230234
.setOnConnect(connectMsgs::add)
231235
.setOnCommand(commands::add)
232236
.setOnMessage(msgs1::add);
233237

234-
ServerEventsClient client2 = new ServerEventsClient("http://chat.servicestack.net")
238+
ServerEventsClient client2 = createServerEventsClient("http://chat.servicestack.net")
235239
.setOnConnect(connectMsgs::add)
236240
.setOnMessage(msgs2::add))
237241
{
@@ -304,7 +308,7 @@ public void test_Does_send_multiple_heartbeats() throws Exception {
304308
final CountDownLatch signal = new CountDownLatch(1);
305309

306310
List<ServerEventMessage> heartbeats = new ArrayList<>();
307-
try(ServerEventsClient client1 = new ServerEventsClient("http://chat.servicestack.net")
311+
try(ServerEventsClient client1 = createServerEventsClient("http://chat.servicestack.net")
308312
.setOnConnect(e -> e.setHeartbeatIntervalMs(1000)) //change to 1s
309313
.setOnHeartbeat(e -> {
310314
heartbeats.add(e);
@@ -323,7 +327,7 @@ public void test_Does_reconnect_on_lost_connection() throws Exception {
323327

324328
List<ServerEventConnect> connectMsgs = new ArrayList<>();
325329
List<ServerEventMessage> msgs1 = new ArrayList<>();
326-
try(ServerEventsClient client1 = new ServerEventsClient("http://chat.servicestack.net")
330+
try(ServerEventsClient client1 = createServerEventsClient("http://chat.servicestack.net")
327331
.setOnConnect(connectMsgs::add)
328332
.setOnMessage(msgs1::add)
329333
.start()) {
@@ -340,7 +344,7 @@ public void test_Does_reconnect_on_lost_connection() throws Exception {
340344

341345
client1.getServiceClient().post(new ResetServerEvents());
342346

343-
try(ServerEventsClient client2 = new ServerEventsClient("http://chat.servicestack.net")
347+
try(ServerEventsClient client2 = createServerEventsClient("http://chat.servicestack.net")
344348
.setOnConnect(connectMsgs::add)
345349
.start()) {
346350

@@ -367,7 +371,7 @@ public void test_Does_send_message_to_Handler() throws Exception {
367371

368372
List<ChatMessage> chatMsgs = new ArrayList<>();
369373

370-
try(ServerEventsClient client1 = new ServerEventsClient("http://chat.servicestack.net")
374+
try(ServerEventsClient client1 = createServerEventsClient("http://chat.servicestack.net")
371375
.registerHandler("chat", (client, e) -> {
372376
ChatMessage chatMsg = JsonUtils.fromJson(e.getJson(), ChatMessage.class);
373377
chatMsgs.add(chatMsg);
@@ -398,7 +402,7 @@ public void test_Does_send_message_to_Handler() throws Exception {
398402
public void test_Does_send_message_to_named_receiver() throws Exception {
399403
List<ServerEventMessage> msgs1 = new ArrayList<>();
400404

401-
try(ServerEventsClient client1 = new ServerEventsClient("http://chat.servicestack.net")
405+
try(ServerEventsClient client1 = createServerEventsClient("http://chat.servicestack.net")
402406
.registerNamedReceiver("test", TestNamedReceiver.class)
403407
.setOnMessage(msgs1::add)
404408
.start()
@@ -462,7 +466,7 @@ public void test_Does_send_message_to_named_receiver() throws Exception {
462466
public void test_Does_send_message_to_global_receiver() throws Exception {
463467
List<ServerEventMessage> msgs1 = new ArrayList<>();
464468

465-
try(ServerEventsClient client1 = new ServerEventsClient("http://chat.servicestack.net")
469+
try(ServerEventsClient client1 = createServerEventsClient("http://chat.servicestack.net")
466470
.registerReceiver(TestGlobalReceiver.class)
467471
.setOnMessage(msgs1::add)
468472
.start()
@@ -486,7 +490,7 @@ public void test_Does_send_message_to_global_receiver() throws Exception {
486490
public void test_Does_set_properties_on_global_receiver() throws Exception {
487491
List<ServerEventMessage> msgs1 = new ArrayList<>();
488492

489-
try(ServerEventsClient client1 = new ServerEventsClient("http://chat.servicestack.net")
493+
try(ServerEventsClient client1 = createServerEventsClient("http://chat.servicestack.net")
490494
.registerReceiver(TestGlobalReceiver.class)
491495
.setOnMessage(msgs1::add)
492496
.start()
@@ -510,7 +514,7 @@ public void test_Does_set_properties_on_global_receiver() throws Exception {
510514
public void test_Does_send_raw_string_messages() throws Exception {
511515
List<ServerEventMessage> msgs1 = new ArrayList<>();
512516

513-
try(ServerEventsClient client1 = new ServerEventsClient("http://chat.servicestack.net")
517+
try(ServerEventsClient client1 = createServerEventsClient("http://chat.servicestack.net")
514518
.registerReceiver(TestJavaScriptReceiver.class)
515519
.registerNamedReceiver("css", TestJavaScriptReceiver.class)
516520
.setOnMessage(msgs1::add)
@@ -569,7 +573,7 @@ public void test_Does_send_raw_string_messages() throws Exception {
569573
public void test_Can_reuse_same_instance() throws Exception {
570574
List<ServerEventMessage> msgs1 = new ArrayList<>();
571575

572-
try(ServerEventsClient client1 = new ServerEventsClient("http://chat.servicestack.net")
576+
try(ServerEventsClient client1 = createServerEventsClient("http://chat.servicestack.net")
573577
.registerReceiver(TestJavaScriptReceiver.class)
574578
.registerNamedReceiver("css", TestJavaScriptReceiver.class)
575579
.setResolver(new SingletonInstanceResolver())
@@ -607,16 +611,16 @@ public void test_Does_receive_messages_on_to_clients_subscribed_on_multiple_chan
607611
List<ServerEventMessage> msgsABC = new ArrayList<>();
608612
List<ServerEventMessage> msgsABCD = new ArrayList<>();
609613

610-
try(ServerEventsClient clientA = new ServerEventsClient("http://chat.servicestack.net", "A")
614+
try(ServerEventsClient clientA = createServerEventsClient("http://chat.servicestack.net", "A")
611615
.setOnMessage(msgsA::add)
612616
.start();
613-
ServerEventsClient clientAB = new ServerEventsClient("http://chat.servicestack.net", "A", "B")
617+
ServerEventsClient clientAB = createServerEventsClient("http://chat.servicestack.net", "A", "B")
614618
.setOnMessage(msgsAB::add)
615619
.start();
616-
ServerEventsClient clientABC = new ServerEventsClient("http://chat.servicestack.net", "A", "B", "C")
620+
ServerEventsClient clientABC = createServerEventsClient("http://chat.servicestack.net", "A", "B", "C")
617621
.setOnMessage(msgsABC::add)
618622
.start();
619-
ServerEventsClient clientABCD = new ServerEventsClient("http://chat.servicestack.net", "A", "B", "C", "D")
623+
ServerEventsClient clientABCD = createServerEventsClient("http://chat.servicestack.net", "A", "B", "C", "D")
620624
.setOnMessage(msgsABCD::add)
621625
.start()) {
622626

@@ -670,23 +674,23 @@ public void test_Does_receive_all_join_and_leave_messages() throws Exception {
670674
List<ServerEventLeave> leaveB = new ArrayList<>();
671675
List<ServerEventLeave> leaveAB = new ArrayList<>();
672676

673-
try(ServerEventsClient clientA = new ServerEventsClient("http://chat.servicestack.net", "A")
677+
try(ServerEventsClient clientA = createServerEventsClient("http://chat.servicestack.net", "A")
674678
.setOnCommand(e -> {
675679
if (e instanceof ServerEventJoin){
676680
joinA.add((ServerEventJoin)e);
677681
} else if (e instanceof ServerEventLeave){
678682
leaveA.add((ServerEventLeave)e);
679683
}
680684
});
681-
ServerEventsClient clientB = new ServerEventsClient("http://chat.servicestack.net", "B")
685+
ServerEventsClient clientB = createServerEventsClient("http://chat.servicestack.net", "B")
682686
.setOnCommand(e -> {
683687
if (e instanceof ServerEventJoin){
684688
joinB.add((ServerEventJoin)e);
685689
} else if (e instanceof ServerEventLeave){
686690
leaveB.add((ServerEventLeave)e);
687691
}
688692
});
689-
ServerEventsClient clientAB = new ServerEventsClient("http://chat.servicestack.net", "A", "B")
693+
ServerEventsClient clientAB = createServerEventsClient("http://chat.servicestack.net", "A", "B")
690694
.setOnCommand(e -> {
691695
if (e instanceof ServerEventJoin){
692696
joinAB.add((ServerEventJoin)e);
@@ -753,23 +757,23 @@ public void test_MultiChannel_Does_receive_all_join_and_leave_messages() throws
753757
List<ServerEventLeave> leaveAB = new ArrayList<>();
754758

755759
try(
756-
ServerEventsClient clientAB = new ServerEventsClient("http://chat.servicestack.net", "A", "B")
760+
ServerEventsClient clientAB = createServerEventsClient("http://chat.servicestack.net", "A", "B")
757761
.setOnCommand(e -> {
758762
if (e instanceof ServerEventJoin){
759763
joinAB.add((ServerEventJoin)e);
760764
} else if (e instanceof ServerEventLeave){
761765
leaveAB.add((ServerEventLeave)e);
762766
}
763767
});
764-
ServerEventsClient clientA = new ServerEventsClient("http://chat.servicestack.net", "A")
768+
ServerEventsClient clientA = createServerEventsClient("http://chat.servicestack.net", "A")
765769
.setOnCommand(e -> {
766770
if (e instanceof ServerEventJoin){
767771
joinA.add((ServerEventJoin)e);
768772
} else if (e instanceof ServerEventLeave){
769773
leaveA.add((ServerEventLeave)e);
770774
}
771775
});
772-
ServerEventsClient clientB = new ServerEventsClient("http://chat.servicestack.net", "B")
776+
ServerEventsClient clientB = createServerEventsClient("http://chat.servicestack.net", "B")
773777
.setOnCommand(e -> {
774778
if (e instanceof ServerEventJoin){
775779
joinB.add((ServerEventJoin)e);
@@ -805,10 +809,10 @@ public void test_Can_subscribe_to_channels_whilst_connected() throws Exception {
805809
List<ServerEventMessage> msgs1 = new ArrayList<>();
806810
List<ServerEventMessage> msgs2 = new ArrayList<>();
807811

808-
try(ServerEventsClient client1 = new ServerEventsClient("http://chat.servicestack.net", "A")
812+
try(ServerEventsClient client1 = createServerEventsClient("http://chat.servicestack.net", "A")
809813
.setOnMessage(msgs1::add)
810814
.start();
811-
ServerEventsClient client2 = new ServerEventsClient("http://chat.servicestack.net", "B")
815+
ServerEventsClient client2 = createServerEventsClient("http://chat.servicestack.net", "B")
812816
.setOnMessage(msgs2::add)
813817
.start()) {
814818

@@ -857,11 +861,11 @@ public void test_Can_unsubscribe_from_channels_whilst_connected() throws Excepti
857861
List<ServerEventMessage> msgs1 = new ArrayList<>();
858862
List<ServerEventMessage> msgs2 = new ArrayList<>();
859863

860-
try(ServerEventsClient client1 = new ServerEventsClient("http://chat.servicestack.net", "A","B","C")
864+
try(ServerEventsClient client1 = createServerEventsClient("http://chat.servicestack.net", "A","B","C")
861865
.setOnMessage(msgs1::add)
862866
.start()
863867
.waitTillConnected();
864-
ServerEventsClient client2 = new ServerEventsClient("http://chat.servicestack.net", "B","C")
868+
ServerEventsClient client2 = createServerEventsClient("http://chat.servicestack.net", "B","C")
865869
.setOnMessage(msgs2::add)
866870
.start()
867871
.waitTillConnected()) {

0 commit comments

Comments
 (0)