From 2f67532fdd4ed4e0a7a3c225de14b97657a50a2d Mon Sep 17 00:00:00 2001 From: "selva.andre" Date: Wed, 5 Sep 2012 20:57:41 +0200 Subject: [PATCH] Extracted part of setUp for some tests --- .../server/ServerIntegrationFuseTest.java | 75 ++++++++----------- .../server/ServerIntegrationTest.java | 2 +- 2 files changed, 33 insertions(+), 44 deletions(-) diff --git a/parser/src/test/java/org/dna/mqtt/moquette/server/ServerIntegrationFuseTest.java b/parser/src/test/java/org/dna/mqtt/moquette/server/ServerIntegrationFuseTest.java index a55bcf9f..5b2d75df 100644 --- a/parser/src/test/java/org/dna/mqtt/moquette/server/ServerIntegrationFuseTest.java +++ b/parser/src/test/java/org/dna/mqtt/moquette/server/ServerIntegrationFuseTest.java @@ -1,12 +1,8 @@ package org.dna.mqtt.moquette.server; -import org.dna.mqtt.moquette.client.Client; -import org.dna.mqtt.moquette.client.IPublishCallback; -import org.dna.mqtt.moquette.proto.messages.AbstractMessage; import org.fusesource.mqtt.client.*; import org.junit.After; import org.junit.Before; -import org.junit.Ignore; import org.junit.Test; import java.io.File; @@ -20,22 +16,29 @@ import static org.junit.Assert.*; * */ public class ServerIntegrationFuseTest { - boolean received; - Server server; + Server m_server; + MQTT m_mqtt; + FutureConnection m_connection; protected void startServer() throws IOException { - server = new Server(); - server.startServer(); + m_server = new Server(); + m_server.startServer(); } @Before - public void setUp() throws IOException { + public void setUp() throws Exception { startServer(); + + m_mqtt = new MQTT(); + m_mqtt.setHost("localhost", Server.PORT); + m_mqtt.setClientId("TestClient"); } @After - public void tearDown() { - server.stopServer(); + public void tearDown() throws Exception { + m_connection.disconnect().await(); + + m_server.stopServer(); File dbFile = new File(Server.STORAGE_FILE_PATH); if (dbFile.exists()) { dbFile.delete(); @@ -44,82 +47,68 @@ public class ServerIntegrationFuseTest { @Test public void testSubscribe() throws Exception { -// startServer(); - MQTT mqtt = new MQTT(); - mqtt.setHost("localhost", Server.PORT); - mqtt.setClientId("TestClient"); - FutureConnection connection = mqtt.futureConnection(); - connection.connect().await(); + m_connection = m_mqtt.futureConnection(); + m_connection.connect().await(); Topic[] topics = {new Topic("/topic", QoS.AT_MOST_ONCE)}; - Future futSub = connection.subscribe(topics); + Future futSub = m_connection.subscribe(topics); - connection.publish("/topic", "Test my payload".getBytes(), QoS.AT_MOST_ONCE, false).await(); + m_connection.publish("/topic", "Test my payload".getBytes(), QoS.AT_MOST_ONCE, false).await(); byte[] qoses = futSub.await(); assertEquals(1, qoses.length); - connection.disconnect().await(); } @Test public void testPublishWithQoS1() throws Exception { - MQTT mqtt = new MQTT(); - mqtt.setHost("localhost", Server.PORT); - mqtt.setClientId("TestClient"); - FutureConnection connection = mqtt.futureConnection(); - connection.connect().await(); + m_mqtt.setClientId("TestClient"); + m_connection = m_mqtt.futureConnection(); + m_connection.connect().await(); //subscribe to a QoS 1 topic Topic[] topics = {new Topic("/topic", QoS.AT_LEAST_ONCE)}; - Future subscribeFuture = connection.subscribe(topics); + Future subscribeFuture = m_connection.subscribe(topics); byte[] qoses = subscribeFuture.await(); - Future receive = connection.receive(); + Future receive = m_connection.receive(); //publish a QoS 1 message - Future f3 = connection.publish("/topic", "Hello MQTT".getBytes(), QoS.AT_LEAST_ONCE, false); + Future f3 = m_connection.publish("/topic", "Hello MQTT".getBytes(), QoS.AT_LEAST_ONCE, false); //verify the reception Message message = receive.await(); message.ack(); assertEquals("Hello MQTT", new String(message.getPayload())); - - connection.disconnect().await(); } @Test public void testPublishWithQoS1_notCleanSession() throws Exception { - MQTT mqtt = new MQTT(); - mqtt.setHost("localhost", Server.PORT); - mqtt.setClientId("TestClient"); - mqtt.setCleanSession(false); - FutureConnection connection = mqtt.futureConnection() ; - connection.connect().await(); + m_mqtt.setCleanSession(false); + m_connection = m_mqtt.futureConnection() ; + m_connection.connect().await(); //subscribe to a QoS 1 topic Topic[] topics = {new Topic("/topic", QoS.AT_LEAST_ONCE)}; - Future subscribeFuture = connection.subscribe(topics); + Future subscribeFuture = m_connection.subscribe(topics); byte[] qoses = subscribeFuture.await(); - connection.disconnect().await(); + m_connection.disconnect().await(); //publish a QoS 1 message another client publish a message on the topic publishFromAnotherClient("/topic", "Hello MQTT".getBytes(), QoS.AT_LEAST_ONCE); //Reconnect - connection = mqtt.futureConnection(); - connection.connect().await(); - Future receive = connection.receive(); + m_connection = m_mqtt.futureConnection(); + m_connection.connect().await(); + Future receive = m_connection.receive(); //verify the reception Message message = receive.await(); message.ack(); assertEquals("Hello MQTT", new String(message.getPayload())); - - connection.disconnect().await(); } private void publishFromAnotherClient(String topic, byte[] payload, QoS qos) throws Exception { diff --git a/parser/src/test/java/org/dna/mqtt/moquette/server/ServerIntegrationTest.java b/parser/src/test/java/org/dna/mqtt/moquette/server/ServerIntegrationTest.java index d174bc04..aa294aa2 100644 --- a/parser/src/test/java/org/dna/mqtt/moquette/server/ServerIntegrationTest.java +++ b/parser/src/test/java/org/dna/mqtt/moquette/server/ServerIntegrationTest.java @@ -127,7 +127,7 @@ public class ServerIntegrationTest { /** * Check that after a client has connected with clean session false, subscribed - * to some topic and exited, if it reconnect with clean session true, the server + * to some topic and exited, if it reconnect with clean session true, the m_server * correctly cleanup every previous subscription */ @Test