Skip to content

Fix join message in websocket quickstart #1309

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

Open
wants to merge 2 commits into
base: development
Choose a base branch
from
Open

Fix join message in websocket quickstart #1309

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a3f8412
Fix join message in websocket quickstart
mocenas Jul 27, 2023
5462734
Fix test for websocket connect message
mocenas Aug 7, 2023
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
7 changes: 2 additions & 5 deletions websockets-quickstart/src/main/java/org/acme/websockets/ChatSocket.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ public class ChatSocket {

@OnOpen
public void onOpen(Session session, @PathParam("username") String username) {
broadcast("User " + username + " joined");
sessions.put(username, session);
}

Expand All @@ -42,11 +43,7 @@ public void onError(Session session, @PathParam("username") String username, Thr

@OnMessage
public void onMessage(String message, @PathParam("username") String username) {
if (message.equalsIgnoreCase("_ready_")) {
broadcast("User " + username + " joined");
} else {
broadcast(">> " + username + ": " + message);
}
broadcast(">> " + username + ": " + message);
}

private void broadcast(String message) {
Expand Down
32 changes: 13 additions & 19 deletions websockets-quickstart/src/test/java/org/acme/websockets/ChatTest.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,20 +1,17 @@
package org.acme.websockets;

import java.net.URI;
import java.util.concurrent.LinkedBlockingDeque;
import java.util.concurrent.TimeUnit;

import io.quarkus.test.common.http.TestHTTPResource;
import io.quarkus.test.junit.QuarkusTest;
import jakarta.websocket.ClientEndpoint;
import jakarta.websocket.ContainerProvider;
import jakarta.websocket.OnMessage;
import jakarta.websocket.OnOpen;
import jakarta.websocket.Session;

import org.junit.jupiter.api.Assertions;
import org.junit.jupiter.api.Test;

import io.quarkus.test.common.http.TestHTTPResource;
import io.quarkus.test.junit.QuarkusTest;
import java.net.URI;
import java.util.concurrent.LinkedBlockingDeque;
import java.util.concurrent.TimeUnit;

@QuarkusTest
public class ChatTest {
Expand All @@ -24,27 +21,24 @@ public class ChatTest {
@TestHTTPResource("/chat/stu")
URI uri;

@TestHTTPResource("/chat/foo")
URI uriUserFoo;

@Test
public void testWebsocketChat() throws Exception {
try (Session session = ContainerProvider.getWebSocketContainer().connectToServer(Client.class, uri)) {
Assertions.assertEquals("CONNECT", MESSAGES.poll(10, TimeUnit.SECONDS));
Assertions.assertEquals("User stu joined", MESSAGES.poll(10, TimeUnit.SECONDS));
session.getAsyncRemote().sendText("hello world");
Assertions.assertEquals(">> stu: hello world", MESSAGES.poll(10, TimeUnit.SECONDS));

// We need another user to connect, so we can see connect message
ContainerProvider.getWebSocketContainer().connectToServer(Client.class, uriUserFoo);

Assertions.assertEquals("User foo joined", MESSAGES.poll(10, TimeUnit.SECONDS));
}
}

@ClientEndpoint
public static class Client {

@OnOpen
public void open(Session session) {
MESSAGES.add("CONNECT");
// Send a message to indicate that we are ready,
// as the message handler may not be registered immediately after this callback.
session.getAsyncRemote().sendText("_ready_");
}

@OnMessage
void message(String msg) {
MESSAGES.add(msg);
Expand Down