Skip to content

Commit fa1c800

Browse files
author
Reza Rahman
committed
Porting to GlassFish
1 parent 5fc775f commit fa1c800

File tree

4 files changed

+52
-65
lines changed

4 files changed

+52
-65
lines changed

‎actionbazaar/src/main/java/com/actionbazaar/interfaces/socket/ChatServer.java‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,13 +42,15 @@
4242
import java.io.IOException;
4343
import java.util.logging.Level;
4444
import java.util.logging.Logger;
45+
import javax.ejb.Singleton;
4546
import javax.websocket.EncodeException;
4647
import javax.websocket.OnClose;
4748
import javax.websocket.OnMessage;
4849
import javax.websocket.OnOpen;
4950
import javax.websocket.Session;
5051
import javax.websocket.server.ServerEndpoint;
5152

53+
@Singleton
5254
@ServerEndpoint(value = "/chat",
5355
encoders = {ChatMessage.class}, decoders = {ChatMessage.class})
5456
public class ChatServer {

‎actionbazaar/src/test/java/com/actionbazaar/interfaces/rest/BidRestServiceTest.java‎

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -51,7 +51,6 @@
5151
import org.jboss.arquillian.junit.Arquillian;
5252
import org.jboss.arquillian.junit.InSequence;
5353
import org.jboss.shrinkwrap.api.ShrinkWrap;
54-
import org.jboss.shrinkwrap.api.asset.EmptyAsset;
5554
import org.jboss.shrinkwrap.api.spec.WebArchive;
5655
import static org.junit.Assert.assertEquals;
5756
import static org.junit.Assert.assertNull;
@@ -71,8 +70,8 @@ public static WebArchive createDeployment() {
7170
.addClasses(BidRestService.class, RestConfiguration.class,
7271
BidService.class, DefaultBidService.class,
7372
BidRepository.class, DefaultBidRepository.class, Bid.class)
74-
.addAsWebInfResource(EmptyAsset.INSTANCE, "beans.xml")
75-
.addAsWebInfResource("test-weblogic.xml", "weblogic.xml")
73+
.addAsWebInfResource("test-beans.xml", "beans.xml")
74+
.addAsWebInfResource("test-persistence-web.xml", "web.xml")
7675
.addAsResource("test-persistence.xml",
7776
"META-INF/persistence.xml");
7877
}
@@ -81,7 +80,7 @@ public static WebArchive createDeployment() {
8180
@InSequence(1)
8281
public void testAddBid() {
8382
WebTarget target = ClientBuilder.newClient()
84-
.target("http://localhost:7001/actionbazaar-test/rest/bids");
83+
.target("http://localhost:8080/actionbazaar-test/rest/bids");
8584
// Save a new bid.
8685
Bid bid = new Bid();
8786

@@ -106,7 +105,7 @@ public void testAddBid() {
106105
@InSequence(2)
107106
public void testUpdateBid() {
108107
WebTarget target = ClientBuilder.newClient()
109-
.target("http://localhost:7001/actionbazaar-test/rest/bids/{id}")
108+
.target("http://localhost:8080/actionbazaar-test/rest/bids/{id}")
110109
.resolveTemplate("id", bidId);
111110

112111
// Update bid.
@@ -128,7 +127,7 @@ public void testUpdateBid() {
128127
@InSequence(3)
129128
public void testDeleteBid() {
130129
WebTarget target = ClientBuilder.newClient()
131-
.target("http://localhost:7001/actionbazaar-test/rest/bids/{id}")
130+
.target("http://localhost:8080/actionbazaar-test/rest/bids/{id}")
132131
.resolveTemplate("id", bidId);
133132

134133
target.request().delete();

‎actionbazaar/src/test/java/com/actionbazaar/interfaces/socket/ChatServerTest.java‎

Lines changed: 45 additions & 48 deletions
Original file line numberDiff line numberDiff line change
@@ -65,6 +65,7 @@
6565
import org.junit.runner.RunWith;
6666

6767
@RunWith(Arquillian.class)
68+
// TODO Move test to client side.
6869
public class ChatServerTest {
6970

7071
private static final Logger logger
@@ -73,7 +74,7 @@ public class ChatServerTest {
7374
private static ChatMessage testMessage;
7475
private static ChatMessage testReply;
7576

76-
@Deployment(testable = false)
77+
@Deployment
7778
public static WebArchive createDeployment() {
7879
return ShrinkWrap
7980
.create(WebArchive.class, "actionbazaar-test.war")
@@ -82,64 +83,60 @@ public static WebArchive createDeployment() {
8283
}
8384

8485
@Test
85-
public void testChat() {
86-
try {
87-
URI uri = new URI("ws://localhost:7001/actionbazaar-test/chat");
86+
public void testChat() throws URISyntaxException, DeploymentException, IOException, InterruptedException {
87+
URI uri = new URI("ws://localhost:8080/actionbazaar-test/chat");
8888

89-
WebSocketContainer container = ContainerProvider.getWebSocketContainer();
89+
WebSocketContainer container = ContainerProvider.getWebSocketContainer();
9090

91-
ClientEndpointConfig configuration = ClientEndpointConfig.Builder.create()
92-
.decoders(Arrays.<Class<? extends Decoder>>asList(ChatMessage.class))
93-
.encoders(Arrays.<Class<? extends Encoder>>asList(ChatMessage.class))
94-
.build();
91+
ClientEndpointConfig configuration = ClientEndpointConfig.Builder.create()
92+
.decoders(Arrays.<Class<? extends Decoder>>asList(ChatMessage.class))
93+
.encoders(Arrays.<Class<? extends Encoder>>asList(ChatMessage.class))
94+
.build();
9595

96-
Endpoint client1 = new Endpoint() {
97-
@Override
98-
public void onOpen(Session session, EndpointConfig config) {
99-
try {
100-
session.addMessageHandler(new MessageHandler.Whole<ChatMessage>() {
101-
@Override
102-
public void onMessage(ChatMessage message) {
103-
testReply = message;
104-
}
105-
});
106-
session.getBasicRemote().sendObject(
107-
new ChatMessage("rrahman", "Test message"));
108-
} catch (IOException | EncodeException e) {
109-
logger.log(Level.SEVERE, "Error in chat client", e);
110-
}
111-
}
112-
};
113-
114-
Endpoint client2 = new Endpoint() {
115-
@Override
116-
public void onOpen(final Session session, final EndpointConfig config) {
96+
Endpoint client1 = new Endpoint() {
97+
@Override
98+
public void onOpen(Session session, EndpointConfig config) {
99+
try {
117100
session.addMessageHandler(new MessageHandler.Whole<ChatMessage>() {
118101
@Override
119102
public void onMessage(ChatMessage message) {
120-
try {
121-
testMessage = message;
122-
session.getBasicRemote().sendObject(new ChatMessage("nrahman", "Test reply"));
123-
} catch (IOException | EncodeException ex) {
124-
logger.log(Level.SEVERE, "Error responding to message", ex);
125-
}
103+
testReply = message;
126104
}
127105
});
106+
session.getBasicRemote().sendObject(
107+
new ChatMessage("rrahman", "Test message"));
108+
} catch (IOException | EncodeException e) {
109+
logger.log(Level.SEVERE, "Error in chat client", e);
128110
}
129-
};
111+
}
112+
};
130113

131-
container.connectToServer(client2, configuration, uri);
132-
container.connectToServer(client1, configuration, uri);
114+
Endpoint client2 = new Endpoint() {
115+
@Override
116+
public void onOpen(final Session session, final EndpointConfig config) {
117+
session.addMessageHandler(new MessageHandler.Whole<ChatMessage>() {
118+
@Override
119+
public void onMessage(ChatMessage message) {
120+
try {
121+
testMessage = message;
122+
session.getBasicRemote().sendObject(new ChatMessage("nrahman", "Test reply"));
123+
} catch (IOException | EncodeException ex) {
124+
logger.log(Level.SEVERE, "Error responding to message", ex);
125+
}
126+
}
127+
});
128+
}
129+
};
130+
131+
container.connectToServer(client2, configuration, uri);
132+
container.connectToServer(client1, configuration, uri);
133133

134-
// Wait for conversation to finish.
135-
Thread.sleep(2000);
134+
// Wait for conversation to finish.
135+
Thread.sleep(2000);
136136

137-
assertEquals("rrahman", testMessage.getUser());
138-
assertEquals("Test message", testMessage.getMessage());
139-
assertEquals("nrahman", testReply.getUser());
140-
assertEquals("Test reply", testReply.getMessage());
141-
} catch (URISyntaxException | DeploymentException | IOException | InterruptedException ex) {
142-
logger.log(Level.SEVERE, "Error connecting to server", ex);
143-
}
137+
assertEquals("rrahman", testMessage.getUser());
138+
assertEquals("Test message", testMessage.getMessage());
139+
assertEquals("nrahman", testReply.getUser());
140+
assertEquals("Test reply", testReply.getMessage());
144141
}
145142
}

‎actionbazaar/src/test/resources/test-weblogic.xml‎

Lines changed: 0 additions & 11 deletions
This file was deleted.

0 commit comments

Comments
 (0)