Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[UNDERTOW-2364] Review anonymous classes in Undertow io.undertow.websockets.jsr.test #1712

Open
wants to merge 1 commit into
base: main
Choose a base branch
from
Open

[UNDERTOW-2364] Review anonymous classes in Undertow io.undertow.websockets.jsr.test #1712

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
80 changes: 42 additions & 38 deletions websockets-jsr/src/test/java/io/undertow/websockets/jsr/test/BinaryPartialEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,52 +35,56 @@ public final class BinaryPartialEndpoint extends Endpoint {

@Override
public void onOpen(final Session session, EndpointConfig config) {
session.addMessageHandler(new MessageHandler.Partial<byte[]>() {
session.addMessageHandler(new BinaryPartialMessageHandler(session));

private ByteArrayOutputStream buffer;
}

@Override
public void onMessage(byte[] bytes, boolean last) {
if (last) {
if (buffer == null) {
onRequest(bytes);
} else {
try {
buffer(bytes);
byte[] tmp = buffer.toByteArray();
onRequest(tmp);
} finally {
buffer = null;
}
}
} else {
buffer(bytes);
}
}
private static class BinaryPartialMessageHandler implements MessageHandler.Partial<byte[]> {

private void onRequest(final byte[] bytes) {
// Just return the received bytes for the test
DefaultServer.getWorker().execute(new Runnable() {
@Override
public void run() {
try {
session.getBasicRemote().sendBinary(
ByteBuffer.wrap(bytes));
} catch (IOException e) {
throw new IllegalStateException(e);
}
}
});
}
private final Session session;
private ByteArrayOutputStream buffer;

private void buffer(byte[] data) {
BinaryPartialMessageHandler(Session session) {
this.session = session;
}

@Override
public void onMessage(byte[] bytes, boolean last) {
if (last) {
if (buffer == null) {
buffer = new ByteArrayOutputStream(8096);
onRequest(bytes);
} else {
try {
buffer(bytes);
byte[] tmp = buffer.toByteArray();
onRequest(tmp);
} finally {
buffer = null;
}
}
buffer.write(data, 0, data.length);
} else {
buffer(bytes);
}
}

});
private void onRequest(final byte[] bytes) {
// Just return the received bytes for the test
DefaultServer.getWorker().execute(() -> {
try {
session.getBasicRemote().sendBinary(
ByteBuffer.wrap(bytes));
} catch (IOException e) {
throw new IllegalStateException(e);
}
});
}

private void buffer(byte[] data) {
if (buffer == null) {
buffer = new ByteArrayOutputStream(8096);
}
buffer.write(data, 0, data.length);
}

}
}
16 changes: 6 additions & 10 deletions websockets-jsr/src/test/java/io/undertow/websockets/jsr/test/ProgramaticErrorEndpoint.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,17 +48,13 @@ public static String getMessage() {

@Override
public void onOpen(Session session, EndpointConfig config) {
session.addMessageHandler(new MessageHandler.Whole<String>() {
session.addMessageHandler((MessageHandler.Whole<String>) message -> {

@Override
public void onMessage(String message) {

QUEUE.add(message);
if (message.equals("app-error")) {
throw new RuntimeException("an error");
} else if (message.equals("io-error")) {
throw new RuntimeException(new IOException());
}
QUEUE.add(message);
if (message.equals("app-error")) {
throw new RuntimeException("an error");
} else if (message.equals("io-error")) {
throw new RuntimeException(new IOException());
}
});
}
Expand Down
88 changes: 49 additions & 39 deletions ...ockets-jsr/src/test/java/io/undertow/websockets/jsr/test/TestMessagesReceivedInOrder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,45 +109,7 @@ public void testMessagesReceivedInOrder() throws Exception {
final CountDownLatch done = new CountDownLatch(1);
final AtomicReference<String> error = new AtomicReference<>();
ContainerProvider.getWebSocketContainer()
.connectToServer(new Endpoint() {
@Override
public void onOpen(final Session session, EndpointConfig endpointConfig) {

try {
RemoteEndpoint.Basic rem = session.getBasicRemote();
List<String> messages = new ArrayList<>();
for (int i = 0; i < MESSAGES; i++) {
byte[] data = new byte[2048];
(new Random()).nextBytes(data);
String crc = md5(data);
rem.sendBinary(ByteBuffer.wrap(data));
messages.add(crc);
}

List<String> received = EchoSocket.receivedEchos.getIoFuture().get();
StringBuilder sb = new StringBuilder();
boolean fail = false;
for (int i = 0; i < messages.size(); i++) {
if (received.size() <= i) {
fail = true;
sb.append(i + ": should be " + messages.get(i) + " but is empty.");
} else {
if (!messages.get(i).equals(received.get(i))) {
fail = true;
sb.append(i + ": should be " + messages.get(i) + " but is " + received.get(i) + " (but found at " + received.indexOf(messages.get(i)) + ").");
}
}
}
if(fail) {
error.set(sb.toString());
}
done.countDown();

} catch (Throwable t) {
t.printStackTrace();
}
}
}, clientEndpointConfig, new URI(DefaultServer.getDefaultServerURL() + "/webSocket")
.connectToServer(new MessageOrderValidatorEndpoint(error, done), clientEndpointConfig, new URI(DefaultServer.getDefaultServerURL() + "/webSocket")
);
assertTrue(done.await(30, TimeUnit.SECONDS));
if(error.get() != null) {
Expand Down Expand Up @@ -186,4 +148,52 @@ private static String md5(byte[] buffer) {
throw new InternalError("MD5 not supported on this platform");
}
}

private static class MessageOrderValidatorEndpoint extends Endpoint {
private final AtomicReference<String> error;
private final CountDownLatch done;

MessageOrderValidatorEndpoint(AtomicReference<String> error, CountDownLatch done) {
this.error = error;
this.done = done;
}

@Override
public void onOpen(final Session session, EndpointConfig endpointConfig) {

try {
RemoteEndpoint.Basic rem = session.getBasicRemote();
List<String> messages = new ArrayList<>();
for (int i = 0; i < MESSAGES; i++) {
byte[] data = new byte[2048];
(new Random()).nextBytes(data);
String crc = md5(data);
rem.sendBinary(ByteBuffer.wrap(data));
messages.add(crc);
}

List<String> received = EchoSocket.receivedEchos.getIoFuture().get();
StringBuilder sb = new StringBuilder();
boolean fail = false;
for (int i = 0; i < messages.size(); i++) {
if (received.size() <= i) {
fail = true;
sb.append(i + ": should be " + messages.get(i) + " but is empty.");
} else {
if (!messages.get(i).equals(received.get(i))) {
fail = true;
sb.append(i + ": should be " + messages.get(i) + " but is " + received.get(i) + " (but found at " + received.indexOf(messages.get(i)) + ").");
}
}
}
if(fail) {
error.set(sb.toString());
}
done.countDown();

} catch (Throwable t) {
t.printStackTrace();
}
}
}
}
Loading