Author: gaohoward Date: 2011-09-14 10:25:20 -0400 (Wed, 14 Sep 2011) New Revision: 11349 Modified: branches/STOMP11/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/AbstractClientStompFrame.java branches/STOMP11/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/ClientStompFrame.java branches/STOMP11/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/StompClientConnectionV11.java branches/STOMP11/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/v11/StompTestV11.java Log: tests Modified: branches/STOMP11/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/AbstractClientStompFrame.java =================================================================== --- branches/STOMP11/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/AbstractClientStompFrame.java 2011-09-14 12:29:51 UTC (rev 11348) +++ branches/STOMP11/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/AbstractClientStompFrame.java 2011-09-14 14:25:20 UTC (rev 11349) @@ -111,6 +111,12 @@ this.body = body; } + @Override + public String getBody() + { + return body; + } + private class Header { public String key; Modified: branches/STOMP11/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/ClientStompFrame.java =================================================================== --- branches/STOMP11/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/ClientStompFrame.java 2011-09-14 12:29:51 UTC (rev 11348) +++ branches/STOMP11/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/ClientStompFrame.java 2011-09-14 14:25:20 UTC (rev 11349) @@ -37,5 +37,7 @@ public String getCommand(); public String getHeader(String header); + + public String getBody(); } Modified: branches/STOMP11/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/StompClientConnectionV11.java =================================================================== --- branches/STOMP11/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/StompClientConnectionV11.java 2011-09-14 12:29:51 UTC (rev 11348) +++ branches/STOMP11/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/util/StompClientConnectionV11.java 2011-09-14 14:25:20 UTC (rev 11349) @@ -36,7 +36,7 @@ public void connect(String username, String passcode) throws IOException, InterruptedException { ClientStompFrame frame = factory.newFrame(CONNECT_COMMAND); - frame.addHeader(ACCEPT_HEADER, "1.0,1.1"); + frame.addHeader(ACCEPT_HEADER, "1.1"); frame.addHeader(HOST_HEADER, "localhost"); if (username != null) { Modified: branches/STOMP11/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/v11/StompTestV11.java =================================================================== --- branches/STOMP11/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/v11/StompTestV11.java 2011-09-14 12:29:51 UTC (rev 11348) +++ branches/STOMP11/tests/integration-tests/src/test/java/org/hornetq/tests/integration/stomp/v11/StompTestV11.java 2011-09-14 14:25:20 UTC (rev 11349) @@ -86,7 +86,6 @@ { // case 1 accept-version absent. It is a 1.0 connect ClientStompFrame frame = connV11.createFrame("CONNECT"); - //frame.addHeader("accept-version", "1.0,1.1,1.2"); frame.addHeader("host", "127.0.0.1"); frame.addHeader("login", this.defUser); frame.addHeader("passcode", this.defPass); @@ -167,4 +166,69 @@ connV11.disconnect(); } + + public void testSendAndReceive() throws Exception + { + connV11.connect(defUser, defPass); + ClientStompFrame frame = connV11.createFrame("SEND"); + frame.addHeader("destination", getQueuePrefix() + getQueueName()); + frame.addHeader("content-type", "text/plain"); + frame.setBody("Hello World 1!"); + + ClientStompFrame response = connV11.sendFrame(frame); + + assertNull(response); + + frame.addHeader("receipt", "1234"); + frame.setBody("Hello World 2!"); + + response = connV11.sendFrame(frame); + + assertNotNull(response); + + assertEquals("RECEIPT", response.getCommand()); + + assertEquals("1234", response.getHeader("receipt-id")); + + //subscribe + StompClientConnection newConn = StompClientConnectionFactory.createClientConnection("1.1", hostname, port); + newConn.connect(defUser, defPass); + + ClientStompFrame subFrame = newConn.createFrame("SUBSCRIBE"); + subFrame.addHeader("id", "a-sub"); + subFrame.addHeader("destination", getQueuePrefix() + getQueueName()); + subFrame.addHeader("ack", "auto"); + + newConn.sendFrame(subFrame); + + frame = newConn.receiveFrame(); + + System.out.println("received " + frame); + + assertEquals("MESSAGE", frame.getCommand()); + + assertEquals("a-sub", frame.getHeader("subscription")); + + assertNotNull(frame.getHeader("message-id")); + + assertEquals(getQueuePrefix() + getQueueName(), frame.getHeader("destination")); + + assertEquals("Hello World 1!", frame.getBody()); + + frame = newConn.receiveFrame(); + + System.out.println("received " + frame); + + //unsub + ClientStompFrame unsubFrame = newConn.createFrame("UNSUBSCRIBE"); + unsubFrame.addHeader("id", "a-sub"); + + newConn.disconnect(); + + } } + + + + +