Skip to content

Commit a65cf9e

Browse files
committed
Making test more reliable; random execution order on tests.
1 parent 0f27241 commit a65cf9e

2 files changed

Lines changed: 81 additions & 49 deletions

File tree

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,24 @@
1+
package io.socket;
2+
3+
import java.util.Collections;
4+
5+
import org.junit.runners.BlockJUnit4ClassRunner;
6+
import org.junit.runners.model.InitializationError;
7+
8+
9+
// See http://stackoverflow.com/questions/1444314/how-can-i-make-my-junit-tests-run-in-random-order
10+
11+
public class RandomBlockJUnit4ClassRunner extends BlockJUnit4ClassRunner {
12+
13+
public RandomBlockJUnit4ClassRunner(Class<?> klass)
14+
throws InitializationError {
15+
super(klass);
16+
}
17+
18+
protected java.util.List<org.junit.runners.model.FrameworkMethod> computeTestMethods() {
19+
java.util.List<org.junit.runners.model.FrameworkMethod> methods = super.computeTestMethods();
20+
Collections.shuffle(methods);
21+
return methods;
22+
}
23+
24+
}

‎tests/io/socket/TestSocketIO.java‎

Lines changed: 57 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,9 @@
1717
import org.junit.Before;
1818
import org.junit.BeforeClass;
1919
import org.junit.Test;
20+
import org.junit.runner.RunWith;
2021

22+
@RunWith(io.socket.RandomBlockJUnit4ClassRunner.class)
2123
public class TestSocketIO implements IOCallback {
2224
private final static String NODE = "/opt/local/bin/node";
2325
private static final int PORT = 10214;
@@ -41,7 +43,7 @@ public static void tearDownAfterClass() throws Exception {
4143

4244
@Before
4345
public void setUp() throws Exception {
44-
events = new LinkedBlockingQueue<String>();
46+
events = new LinkedBlockingQueue<String>();
4547
outputs = new LinkedBlockingQueue<String>();
4648
args = new LinkedBlockingQueue<Object>();
4749
node = Runtime.getRuntime().exec(
@@ -99,13 +101,13 @@ public void tearDown() throws Exception {
99101
stderrThread.interrupt();
100102
stdoutThread.interrupt();
101103
node.waitFor();
102-
for(String s : events) {
104+
for (String s : events) {
103105
System.out.println("Event in Queue: " + s);
104106
}
105-
for(String line : outputs) {
107+
for (String line : outputs) {
106108
System.out.println("Line in Queue: " + line);
107109
}
108-
for(Object o : args) {
110+
for (Object o : args) {
109111
System.out.println("Argument in Queue: " + o.toString());
110112
}
111113
}
@@ -119,20 +121,20 @@ void doConnect() throws Exception {
119121
void doClose() throws Exception {
120122
socket.disconnect();
121123
assertEquals("onDisconnect", takeEvent());
122-
while(outputs.size() != 0) {
124+
125+
while (outputs.size() != 0) {
123126
fail("Line in queue: " + outputs.poll());
124-
}
125-
while(events.size() != 0) {
126-
fail("Event in queue: " + events.poll());
127127
}
128-
while(args.size() != 0) {
128+
while (events.size() != 0) {
129129
fail("Event in queue: " + events.poll());
130-
}
130+
}
131+
while (args.size() != 0) {
132+
fail("Arguments in queue: " + args.poll());
133+
}
131134
}
132135

133-
134136
// BEGIN TESTS
135-
137+
136138
@Test
137139
public void send() throws Exception {
138140
doConnect();
@@ -141,100 +143,106 @@ public void send() throws Exception {
141143
assertEquals("MESSAGE:" + str, takeLine());
142144
doClose();
143145
}
144-
146+
145147
@Test
146148
public void emitAndOn() throws Exception {
147149
doConnect();
148-
150+
149151
String str = "TESTSTRING";
150152
socket.emit("echo", str);
151-
assertEquals("Test String", "on", takeEvent());
152-
assertEquals(str, takeArg());
153-
154-
JSONObject obj = new JSONObject("{'foo':'bar'}");
153+
assertEquals("Test String", "on", takeEvent());
154+
assertEquals(str, takeArg());
155+
156+
JSONObject obj = new JSONObject("{'foo':'bar'}");
155157
socket.emit("echo", obj);
156158
assertEquals("Test JSON", "on", takeEvent());
157-
assertEquals(obj.toString(), takeArg().toString());
158-
159+
assertEquals(obj.toString(), takeArg().toString());
160+
159161
doClose();
160-
}
161-
162+
}
163+
162164
@Test
163165
public void emitAndMessage() throws Exception {
164166
doConnect();
165167
String str = "TESTSTRING";
166-
socket.emit("echoSend", str);
167-
assertEquals("onMessage_string", events.take());
168-
assertEquals(str, takeArg());
169-
168+
socket.emit("echoSend", str);
169+
assertEquals("onMessage_string", events.take());
170+
assertEquals(str, takeArg());
171+
170172
/*
171-
// Server sends us a string instead of a JSONObject, strange thing
172-
JSONObject obj = new JSONObject("{'foo':'bar'}");
173-
socket.emit("echoSend", obj);
174-
assertEquals("Test JSON", "onMessage_json", takeEvent());
175-
assertEquals(obj.toString(), takeArg().toString());
176-
*/
173+
* // Server sends us a string instead of a JSONObject, strange thing
174+
* JSONObject obj = new JSONObject("{'foo':'bar'}");
175+
* socket.emit("echoSend", obj); assertEquals("Test JSON",
176+
* "onMessage_json", takeEvent()); assertEquals(obj.toString(),
177+
* takeArg().toString());
178+
*/
177179
doClose();
178180
}
179-
181+
180182
@Test
181183
public void namespaces() throws Exception {
182184
SocketIO ns1 = new SocketIO("http://127.0.0.1:" + PORT + "/ns1", this);
183185
assertEquals("onConnect", takeEvent());
184-
186+
187+
// In some very rare cases, it is possible to receive data on an socket
188+
// which isn't connected yet, this sleep assures that these events
189+
// aren't submitted. This is a server side problem. Maybe socket.io-java
190+
// could cache these events until the server drops the connect event.
191+
Thread.sleep(100);
185192
doConnect();
186-
193+
187194
ns1.disconnect();
188195
assertEquals("onDisconnect", takeEvent());
189-
196+
190197
SocketIO ns2 = new SocketIO("http://127.0.0.1:" + PORT + "/ns2", this);
191198
assertEquals("onConnect", takeEvent());
199+
192200
assertEquals("onMessage_string", takeEvent());
193201
assertEquals("ns2", takeArg());
202+
194203
ns2.disconnect();
195204
assertEquals("onDisconnect", takeEvent());
196205
doClose();
197206
}
198-
207+
199208
@Test
200209
public void error() throws Exception {
201210
doConnect();
202-
SocketIO error = new SocketIO("http://127.0.0.1:" + (PORT+1) + "/ns1", this);
211+
SocketIO error = new SocketIO(
212+
"http://127.0.0.1:" + (PORT + 1) + "/ns1", this);
203213
assertEquals("onError", takeEvent());
204214
doClose();
205215
}
206-
207-
// END TESTS
208-
209216

217+
// END TESTS
210218

211219
String takeEvent() throws InterruptedException {
212220
String event = events.poll(TIMEOUT, TimeUnit.SECONDS);
213-
if(event == null) {
221+
if (event == null) {
214222
fail("takeEvent Timeout!");
215223
}
216224
System.out.println("Event Taken: " + event);
217225
return event;
218226
}
219-
227+
220228
String takeLine() throws InterruptedException {
221229
String line = outputs.poll(TIMEOUT, TimeUnit.SECONDS);
222-
if(line == null) {
230+
if (line == null) {
223231
fail("takeLine Timeout!");
224232
}
225233
System.out.println("Line Taken: " + line);
226234
return line;
227235
}
228-
236+
229237
Object takeArg() throws InterruptedException {
230238
Object arg = args.poll(TIMEOUT, TimeUnit.SECONDS);
231-
if(arg == null) {
239+
if (arg == null) {
232240
fail("takeArg Timeout!");
233241
}
234242
System.out.println("Argument Taken: " + arg);
235243
return arg;
236244
}
237-
245+
238246
@Override
239247
public void onDisconnect() {
240248
events.add("onDisconnect");
@@ -247,7 +255,7 @@ public void onConnect() {
247255

248256
@Override
249257
public void onMessage(String data, IOAcknowledge ack) {
250-
events.add("onMessage_string");
258+
events.add("onMessage_string");
251259
this.args.add(data);
252260
}
253261

@@ -259,7 +267,7 @@ public void onMessage(JSONObject json, IOAcknowledge ack) {
259267

260268
@Override
261269
public void on(String event, IOAcknowledge ack, Object... args) {
262-
events.add("on");
270+
events.add("on");
263271
this.args.addAll(Arrays.asList(args));
264272
}
265273

0 commit comments

Comments
 (0)