Skip to content

Commit 21a6324

Browse files
marci4marci4
committed
Adjust check for Worker Thread
1 parent fe38723 commit 21a6324

File tree

1 file changed

+113
-110
lines changed

1 file changed

+113
-110
lines changed

‎src/test/java/org/java_websocket/issues/Issue666Test.java‎

Lines changed: 113 additions & 110 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@
2929
import java.net.URI;
3030
import java.util.Map;
3131
import java.util.concurrent.CountDownLatch;
32+
3233
import org.java_websocket.WebSocket;
3334
import org.java_websocket.client.WebSocketClient;
3435
import org.java_websocket.handshake.ClientHandshake;
@@ -42,117 +43,119 @@
4243

4344
public class Issue666Test {
4445

45-
private CountDownLatch countServerDownLatch = new CountDownLatch(1);
46-
47-
@Test
48-
public void testServer() throws Exception {
49-
Map<Long, Thread> mapBefore = ThreadCheck.getThreadMap();
50-
int port = SocketUtil.getAvailablePort();
51-
WebSocketServer server = new WebSocketServer(new InetSocketAddress(port)) {
52-
@Override
53-
public void onOpen(WebSocket conn, ClientHandshake handshake) {
54-
}
55-
56-
@Override
57-
public void onClose(WebSocket conn, int code, String reason, boolean remote) {
58-
59-
}
60-
61-
@Override
62-
public void onMessage(WebSocket conn, String message) {
63-
64-
}
65-
66-
@Override
67-
public void onError(WebSocket conn, Exception ex) {
68-
69-
}
70-
71-
@Override
72-
public void onStart() {
73-
countServerDownLatch.countDown();
74-
}
75-
};
76-
server.start();
77-
countServerDownLatch.await();
78-
Map<Long, Thread> mapAfter = ThreadCheck.getThreadMap();
79-
for (long key : mapBefore.keySet()) {
80-
mapAfter.remove(key);
46+
private CountDownLatch countServerDownLatch = new CountDownLatch(1);
47+
48+
@Test
49+
public void testServer() throws Exception {
50+
Map<Long, Thread> mapBefore = ThreadCheck.getThreadMap();
51+
int port = SocketUtil.getAvailablePort();
52+
WebSocketServer server = new WebSocketServer(new InetSocketAddress(port)) {
53+
@Override
54+
public void onOpen(WebSocket conn, ClientHandshake handshake) {
55+
}
56+
57+
@Override
58+
public void onClose(WebSocket conn, int code, String reason, boolean remote) {
59+
60+
}
61+
62+
@Override
63+
public void onMessage(WebSocket conn, String message) {
64+
65+
}
66+
67+
@Override
68+
public void onError(WebSocket conn, Exception ex) {
69+
70+
}
71+
72+
@Override
73+
public void onStart() {
74+
countServerDownLatch.countDown();
75+
}
76+
};
77+
server.start();
78+
countServerDownLatch.await();
79+
Map<Long, Thread> mapAfter = ThreadCheck.getThreadMap();
80+
for (long key : mapBefore.keySet()) {
81+
mapAfter.remove(key);
82+
}
83+
for (Thread thread : mapAfter.values()) {
84+
String name = thread.getName();
85+
if (!name.startsWith("WebSocketSelector-") && !name.startsWith("WebSocketWorker-") && !name
86+
.startsWith("WebSocketConnectionLostChecker-")
87+
&& !name.startsWith("WebSocketConnectReadThread-")) {
88+
fail("Thread not correctly named! Is: " + name);
89+
}
90+
}
91+
server.stop();
8192
}
82-
for (Thread thread : mapAfter.values()) {
83-
String name = thread.getName();
84-
if (!name.startsWith("WebSocketSelector-") && !name.startsWith("WebSocketWorker-") && !name
85-
.startsWith("WebSocketConnectionLostChecker-")) {
86-
fail("Thread not correctly named! Is: " + name);
87-
}
88-
}
89-
server.stop();
90-
}
91-
92-
@Test
93-
public void testClient() throws Exception {
94-
int port = SocketUtil.getAvailablePort();
95-
WebSocketClient client = new WebSocketClient(new URI("ws://localhost:" + port)) {
96-
@Override
97-
public void onOpen(ServerHandshake handshakedata) {
98-
99-
}
10093

101-
@Override
102-
public void onMessage(String message) {
103-
104-
}
105-
106-
@Override
107-
public void onClose(int code, String reason, boolean remote) {
108-
}
109-
110-
@Override
111-
public void onError(Exception ex) {
112-
113-
}
114-
};
115-
WebSocketServer server = new WebSocketServer(new InetSocketAddress(port)) {
116-
@Override
117-
public void onOpen(WebSocket conn, ClientHandshake handshake) {
118-
}
119-
120-
@Override
121-
public void onClose(WebSocket conn, int code, String reason, boolean remote) {
122-
123-
}
124-
125-
@Override
126-
public void onMessage(WebSocket conn, String message) {
127-
128-
}
129-
130-
@Override
131-
public void onError(WebSocket conn, Exception ex) {
132-
133-
}
134-
135-
@Override
136-
public void onStart() {
137-
countServerDownLatch.countDown();
138-
}
139-
};
140-
server.start();
141-
countServerDownLatch.await();
142-
Map<Long, Thread> mapBefore = ThreadCheck.getThreadMap();
143-
client.connectBlocking();
144-
Map<Long, Thread> mapAfter = ThreadCheck.getThreadMap();
145-
for (long key : mapBefore.keySet()) {
146-
mapAfter.remove(key);
147-
}
148-
for (Thread thread : mapAfter.values()) {
149-
String name = thread.getName();
150-
if (!name.startsWith("WebSocketConnectionLostChecker-") && !name.startsWith("WebSocketWriteThread-")
151-
&& !name.startsWith("WebSocketConnectReadThread-")) {
152-
fail("Thread not correctly named! Is: " + name);
153-
}
94+
@Test
95+
public void testClient() throws Exception {
96+
int port = SocketUtil.getAvailablePort();
97+
WebSocketClient client = new WebSocketClient(new URI("ws://localhost:" + port)) {
98+
@Override
99+
public void onOpen(ServerHandshake handshakedata) {
100+
101+
}
102+
103+
@Override
104+
public void onMessage(String message) {
105+
106+
}
107+
108+
@Override
109+
public void onClose(int code, String reason, boolean remote) {
110+
}
111+
112+
@Override
113+
public void onError(Exception ex) {
114+
115+
}
116+
};
117+
WebSocketServer server = new WebSocketServer(new InetSocketAddress(port)) {
118+
@Override
119+
public void onOpen(WebSocket conn, ClientHandshake handshake) {
120+
}
121+
122+
@Override
123+
public void onClose(WebSocket conn, int code, String reason, boolean remote) {
124+
125+
}
126+
127+
@Override
128+
public void onMessage(WebSocket conn, String message) {
129+
130+
}
131+
132+
@Override
133+
public void onError(WebSocket conn, Exception ex) {
134+
135+
}
136+
137+
@Override
138+
public void onStart() {
139+
countServerDownLatch.countDown();
140+
}
141+
};
142+
server.start();
143+
countServerDownLatch.await();
144+
Map<Long, Thread> mapBefore = ThreadCheck.getThreadMap();
145+
client.connectBlocking();
146+
Map<Long, Thread> mapAfter = ThreadCheck.getThreadMap();
147+
for (long key : mapBefore.keySet()) {
148+
mapAfter.remove(key);
149+
}
150+
for (Thread thread : mapAfter.values()) {
151+
String name = thread.getName();
152+
if (!name.startsWith("WebSocketConnectionLostChecker-") && !name.startsWith("WebSocketWriteThread-")
153+
&& !name.startsWith("WebSocketConnectReadThread-")
154+
&& !name.startsWith("WebSocketWorker-")) {
155+
fail("Thread not correctly named! Is: " + name);
156+
}
157+
}
158+
client.close();
159+
server.stop();
154160
}
155-
client.close();
156-
server.stop();
157-
}
158161
}

0 commit comments

Comments
 (0)