Skip to content

Commit d649f44

Browse files
committed
Integrating MutateProxy to tests, deactivated for now.
1 parent 8c13f58 commit d649f44

2 files changed

Lines changed: 57 additions & 38 deletions

File tree

‎tests/io/socket/AbstractTestSocketIO.java‎

Lines changed: 15 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010

1111
import static org.junit.Assert.*;
1212

13+
import io.socket.testutils.MutateProxy;
14+
1315
import java.io.BufferedReader;
1416
import java.io.IOException;
1517
import java.io.InputStreamReader;
@@ -63,6 +65,8 @@ public abstract class AbstractTestSocketIO implements IOCallback {
6365
/** The socket to test. */
6466
private SocketIO socket;
6567

68+
private MutateProxy proxy = null;
69+
6670
/** The transport of this test */
6771
static protected String transport = null;
6872

@@ -94,6 +98,8 @@ public void setUp() throws Exception {
9498
node = Runtime.getRuntime().exec(
9599
new String[] { NODE, "./tests/io/socket/testutils/socketio.js",
96100
"" + getPort(), transport });
101+
//proxy = new MutateProxy(getProxyPort(), getPort());
102+
//proxy.start();
97103

98104
stdoutThread = new Thread("stdoutThread") {
99105
@Override
@@ -184,7 +190,7 @@ public void tearDown() throws Exception {
184190
*/
185191
void doConnect() throws Exception {
186192
// Setting up socket connection
187-
socket = new SocketIO("http://127.0.0.1:" + getPort(), this);
193+
socket = new SocketIO("http://127.0.0.1:" + getProxyPort(), this);
188194
assertEquals("onConnect", takeEvent());
189195
assertEquals(transport, socket.getTransport());
190196
}
@@ -285,7 +291,7 @@ public void emitAndMessage() throws Exception {
285291
*/
286292
@Test(timeout = TIMEOUT)
287293
public void namespaces() throws Exception {
288-
SocketIO ns1 = new SocketIO("http://127.0.0.1:" + getPort() + "/ns1",
294+
SocketIO ns1 = new SocketIO("http://127.0.0.1:" + getProxyPort() + "/ns1",
289295
this);
290296
assertEquals("onConnect", takeEvent());
291297

@@ -299,14 +305,14 @@ public void namespaces() throws Exception {
299305
ns1.disconnect();
300306
assertEquals("onDisconnect", takeEvent());
301307

302-
SocketIO ns2 = new SocketIO("http://127.0.0.1:" + getPort() + "/ns2",
308+
SocketIO ns2 = new SocketIO("http://127.0.0.1:" + getProxyPort() + "/ns2",
303309
this);
304310
assertEquals("onConnect", takeEvent());
305311

306312
assertEquals("onMessage_string", takeEvent());
307313
assertEquals("ns2", takeArg());
308314

309-
SocketIO ns2_2 = new SocketIO("http://127.0.0.1:" + getPort() + "/ns2",
315+
SocketIO ns2_2 = new SocketIO("http://127.0.0.1:" + getProxyPort() + "/ns2",
310316
this);
311317
assertEquals("onConnect", takeEvent());
312318

@@ -488,8 +494,12 @@ public void onError(SocketIOException socketIOException) {
488494
*/
489495
public int getPort() {
490496
if (port == -1)
491-
port = 2048 + (int) (Math.random() * 10000);
497+
port = 2048 + (int) (Math.random() * 10000) * 2;
492498
return port;
493499
}
500+
501+
public int getProxyPort() {
502+
return getPort() + (proxy == null ? 0 : 1);
503+
}
494504

495505
}

‎tests/io/socket/testutils/MutateProxy.java‎

Lines changed: 42 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,28 @@
11
package io.socket.testutils;
22

33
import java.io.IOException;
4-
import java.io.InputStreamReader;
5-
import java.io.OutputStreamWriter;
4+
import java.io.InputStream;
5+
import java.io.OutputStream;
66
import java.net.ServerSocket;
77
import java.net.Socket;
88
import java.net.UnknownHostException;
9-
import java.nio.CharBuffer;
109

1110
public class MutateProxy extends Thread {
1211
int listenPort;
1312
int socketPort;
1413
private Forwarder serverToClient;
1514
private Forwarder clientToServer;
15+
private ServerSocket server;
1616

1717
public MutateProxy(int listenPort, int socketPort) {
1818
super("MutateProxy");
1919
this.listenPort = listenPort;
2020
this.socketPort = socketPort;
21+
try {
22+
server = new ServerSocket(listenPort);
23+
} catch (IOException e) {
24+
e.printStackTrace();
25+
}
2126
}
2227

2328
@Override
@@ -30,53 +35,57 @@ public void run() {
3035
}
3136

3237
void server() throws IOException {
33-
ServerSocket server = new ServerSocket(listenPort);
34-
Socket connection;
35-
while ((connection = server.accept()) != null) {
36-
InputStreamReader reader = new InputStreamReader(
37-
connection.getInputStream());
38-
OutputStreamWriter writer = new OutputStreamWriter(
39-
connection.getOutputStream());
40-
client(reader, writer);
38+
Socket clientSocket;
39+
while ((clientSocket = server.accept()) != null) {
40+
client(clientSocket);
4141
}
4242
}
4343

44-
private void client(final InputStreamReader clientReader,
45-
final OutputStreamWriter clientWriter) throws UnknownHostException,
44+
private void client(Socket clientSocket) throws UnknownHostException,
4645
IOException {
47-
Socket socket = new Socket("127.0.0.1", socketPort);
48-
final InputStreamReader serverReader = new InputStreamReader(
49-
socket.getInputStream());
50-
final OutputStreamWriter serverWriter = new OutputStreamWriter(
51-
socket.getOutputStream());
52-
serverToClient = new Forwarder("serverToClient", serverReader,
53-
clientWriter);
54-
clientToServer = new Forwarder("clientToServer", clientReader,
55-
serverWriter);
46+
Socket serverSocket = new Socket("127.0.0.1", this.socketPort);
47+
serverToClient = new Forwarder("serverToClient", serverSocket,
48+
clientSocket);
49+
clientToServer = new Forwarder("clientToServer", clientSocket,
50+
serverSocket);
5651
serverToClient.start();
5752
clientToServer.start();
5853
}
5954

60-
private static class Forwarder extends Thread {
61-
private OutputStreamWriter output;
62-
private InputStreamReader input;
55+
private class Forwarder extends Thread {
56+
private Socket from;
57+
private Socket to;
6358

64-
public Forwarder(String name, InputStreamReader input,
65-
OutputStreamWriter output) {
59+
public Forwarder(String name, Socket from, Socket to) {
6660
super(name);
67-
this.output = output;
68-
this.input = input;
61+
this.from = from;
62+
this.to = to;
6963
}
7064

7165
@Override
7266
public void run() {
73-
CharBuffer buffer = CharBuffer.allocate(1024);
7467
try {
75-
while(input.read(buffer) != 0) {
76-
output.append(buffer.toString());
68+
byte[] buffer = new byte[1024];
69+
InputStream fromStream = from.getInputStream();
70+
OutputStream toStream = to.getOutputStream();
71+
while (fromStream.read(buffer) > 0) {
72+
toStream.write(buffer);
73+
toStream.flush();
7774
}
7875
} catch (IOException e) {
79-
e.printStackTrace();
76+
synchronized (MutateProxy.this) {
77+
System.err.println("Thread " + this.getName());
78+
e.printStackTrace();
79+
}
80+
} finally {
81+
try {
82+
to.close();
83+
} catch (IOException e) {
84+
}
85+
try {
86+
from.close();
87+
} catch (IOException e) {
88+
}
8089
}
8190
}
8291
}

0 commit comments

Comments
 (0)