Temp save
This commit is contained in:
@@ -7,7 +7,6 @@ import java.util.List;
|
|||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
import java.util.concurrent.locks.ReadWriteLock;
|
import java.util.concurrent.locks.ReadWriteLock;
|
||||||
import java.util.concurrent.locks.ReentrantReadWriteLock;
|
import java.util.concurrent.locks.ReentrantReadWriteLock;
|
||||||
import java.util.logging.Level;
|
|
||||||
import org.dna.mqtt.moquette.MQTTException;
|
import org.dna.mqtt.moquette.MQTTException;
|
||||||
import org.dna.mqtt.moquette.messaging.spi.IMessaging;
|
import org.dna.mqtt.moquette.messaging.spi.IMessaging;
|
||||||
import org.dna.mqtt.moquette.messaging.spi.INotifier;
|
import org.dna.mqtt.moquette.messaging.spi.INotifier;
|
||||||
|
|||||||
@@ -37,80 +37,184 @@ public class ServerIntegrationTest {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
//
|
||||||
|
// @Test
|
||||||
|
// public void testSubscribe() throws IOException, InterruptedException {
|
||||||
|
//// startServer();
|
||||||
|
// Client client = new Client("localhost", Server.PORT);
|
||||||
|
//// Client client = new Client("test.mosquitto.org", 1883);
|
||||||
|
// client.connect();
|
||||||
|
//
|
||||||
|
//
|
||||||
|
// client.subscribe("/topic", new IPublishCallback() {
|
||||||
|
//
|
||||||
|
// public void published(String topic, byte[] message) {
|
||||||
|
// received = true;
|
||||||
|
// }
|
||||||
|
// });
|
||||||
|
//
|
||||||
|
// client.publish("/topic", "Test my payload".getBytes());
|
||||||
|
//
|
||||||
|
// client.close();
|
||||||
|
// client.shutdown();
|
||||||
|
//
|
||||||
|
// assertTrue(received);
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
//
|
||||||
|
// @Test
|
||||||
|
// public void testCleanSession_maintainClientSubscriptions() {
|
||||||
|
// Client client = new Client("localhost", Server.PORT/*, "CLID_123"*/);
|
||||||
|
// client.connect(false); //without session cleanup
|
||||||
|
//
|
||||||
|
// client.subscribe("/topic", new IPublishCallback() {
|
||||||
|
//
|
||||||
|
// public void published(String topic, byte[] message) {
|
||||||
|
// received = true;
|
||||||
|
// }
|
||||||
|
// });
|
||||||
|
// client.close();
|
||||||
|
//
|
||||||
|
// //Exercise that the client maintain the subscriptions
|
||||||
|
// client.connect(false);
|
||||||
|
// client.publish("/topic", "Test my payload".getBytes());
|
||||||
|
// client.close();
|
||||||
|
//
|
||||||
|
// //Verify
|
||||||
|
// assertTrue(received);
|
||||||
|
//
|
||||||
|
// //TearDown
|
||||||
|
// client.shutdown();
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
// @Test
|
||||||
|
// public void testCleanSession_maintainClientSubscriptions_againstClientDestruction() {
|
||||||
|
// Client client = new Client("localhost", Server.PORT, "CLID_123");
|
||||||
|
// client.connect(false); //without session cleanup
|
||||||
|
//
|
||||||
|
// client.subscribe("/topic", new IPublishCallback() {
|
||||||
|
//
|
||||||
|
// public void published(String topic, byte[] message) {
|
||||||
|
// received = true;
|
||||||
|
// }
|
||||||
|
// });
|
||||||
|
// client.close();
|
||||||
|
// client.shutdown();
|
||||||
|
//
|
||||||
|
// //Exercise that the client maintain the subscriptions
|
||||||
|
// client = new Client("localhost", Server.PORT, "CLID_123");
|
||||||
|
// client.register("/topic", new IPublishCallback() {
|
||||||
|
//
|
||||||
|
// public void published(String topic, byte[] message) {
|
||||||
|
// received = true;
|
||||||
|
// }
|
||||||
|
// });
|
||||||
|
// client.connect(false);
|
||||||
|
// client.publish("/topic", "Test my payload".getBytes());
|
||||||
|
// client.close();
|
||||||
|
//
|
||||||
|
// //Verify
|
||||||
|
// assertTrue(received);
|
||||||
|
//
|
||||||
|
// //TearDown
|
||||||
|
// client.shutdown();
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
//
|
||||||
|
// /**
|
||||||
|
// * 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
|
||||||
|
// * correctly cleanup every previous subscription
|
||||||
|
// */
|
||||||
|
// @Test
|
||||||
|
// public void testCleanSession_correctlyClientSubscriptions() {
|
||||||
|
// Client client = new Client("localhost", Server.PORT, "CLID_123");
|
||||||
|
// client.connect(false); //without session cleanup
|
||||||
|
//
|
||||||
|
// client.subscribe("/topic", new IPublishCallback() {
|
||||||
|
//
|
||||||
|
// public void published(String topic, byte[] message) {
|
||||||
|
// received = true;
|
||||||
|
// }
|
||||||
|
// });
|
||||||
|
// client.close();
|
||||||
|
// client.shutdown();
|
||||||
|
//
|
||||||
|
// //Exercise that the client maintain the subscriptions
|
||||||
|
// client = new Client("localhost", Server.PORT, "CLID_123");
|
||||||
|
// client.register("/topic", new IPublishCallback() {
|
||||||
|
//
|
||||||
|
// public void published(String topic, byte[] message) {
|
||||||
|
// received = true;
|
||||||
|
// }
|
||||||
|
// });
|
||||||
|
// client.connect(true);
|
||||||
|
// client.publish("/topic", "Test my payload".getBytes());
|
||||||
|
// client.close();
|
||||||
|
//
|
||||||
|
// //Verify
|
||||||
|
// assertFalse(received);
|
||||||
|
//
|
||||||
|
// //TearDown
|
||||||
|
// client.shutdown();
|
||||||
|
// }
|
||||||
|
//
|
||||||
|
//
|
||||||
|
// @Test
|
||||||
|
// public void testCleanSession_maintainClientSubscriptions_withServerRestart() throws IOException {
|
||||||
|
// Client client = new Client("localhost", Server.PORT, "CLID_123");
|
||||||
|
// client.connect(false); //without session cleanup
|
||||||
|
//
|
||||||
|
// client.subscribe("/topic", new IPublishCallback() {
|
||||||
|
//
|
||||||
|
// public void published(String topic, byte[] message) {
|
||||||
|
// received = true;
|
||||||
|
// }
|
||||||
|
// });
|
||||||
|
// client.close();
|
||||||
|
// client.shutdown();
|
||||||
|
// server.stopServer();
|
||||||
|
//
|
||||||
|
// server.startServer();
|
||||||
|
//
|
||||||
|
// //Exercise that the client maintain the subscriptions
|
||||||
|
// client = new Client("localhost", Server.PORT, "CLID_123");
|
||||||
|
// client.register("/topic", new IPublishCallback() {
|
||||||
|
//
|
||||||
|
// public void published(String topic, byte[] message) {
|
||||||
|
// received = true;
|
||||||
|
// }
|
||||||
|
// });
|
||||||
|
// client.connect(false);
|
||||||
|
// client.publish("/topic", "Test my payload".getBytes());
|
||||||
|
// client.close();
|
||||||
|
//
|
||||||
|
// //Verify
|
||||||
|
// assertTrue(received);
|
||||||
|
//
|
||||||
|
// //TearDown
|
||||||
|
// client.shutdown();
|
||||||
|
// }
|
||||||
|
|
||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void testSubscribe() throws IOException, InterruptedException {
|
public void testRetain_maintainMessage_againstClientDestruction() {
|
||||||
// startServer();
|
Client client = new Client("localhost", Server.PORT, "CLID_123");
|
||||||
Client client = new Client("localhost", Server.PORT);
|
|
||||||
// Client client = new Client("test.mosquitto.org", 1883);
|
|
||||||
client.connect();
|
client.connect();
|
||||||
|
|
||||||
|
client.publish("/topic", "Test my payload".getBytes(), true);
|
||||||
client.subscribe("/topic", new IPublishCallback() {
|
|
||||||
|
|
||||||
public void published(String topic, byte[] message) {
|
|
||||||
received = true;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
|
|
||||||
client.publish("/topic", "Test my payload".getBytes());
|
|
||||||
|
|
||||||
client.close();
|
|
||||||
client.shutdown();
|
|
||||||
|
|
||||||
assertTrue(received);
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testCleanSession_maintainClientSubscriptions() {
|
|
||||||
Client client = new Client("localhost", Server.PORT/*, "CLID_123"*/);
|
|
||||||
client.connect(false); //without session cleanup
|
|
||||||
|
|
||||||
client.subscribe("/topic", new IPublishCallback() {
|
|
||||||
|
|
||||||
public void published(String topic, byte[] message) {
|
|
||||||
received = true;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
client.close();
|
|
||||||
|
|
||||||
//Exercise that the client maintain the subscriptions
|
|
||||||
client.connect(false);
|
|
||||||
client.publish("/topic", "Test my payload".getBytes());
|
|
||||||
client.close();
|
|
||||||
|
|
||||||
//Verify
|
|
||||||
assertTrue(received);
|
|
||||||
|
|
||||||
//TearDown
|
|
||||||
client.shutdown();
|
|
||||||
}
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testCleanSession_maintainClientSubscriptions_againstClientDestruction() {
|
|
||||||
Client client = new Client("localhost", Server.PORT, "CLID_123");
|
|
||||||
client.connect(false); //without session cleanup
|
|
||||||
|
|
||||||
client.subscribe("/topic", new IPublishCallback() {
|
|
||||||
|
|
||||||
public void published(String topic, byte[] message) {
|
|
||||||
received = true;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
client.close();
|
client.close();
|
||||||
client.shutdown();
|
client.shutdown();
|
||||||
|
|
||||||
//Exercise that the client maintain the subscriptions
|
//Exercise that the client maintain the subscriptions
|
||||||
client = new Client("localhost", Server.PORT, "CLID_123");
|
client = new Client("localhost", Server.PORT, "CLID_123");
|
||||||
client.register("/topic", new IPublishCallback() {
|
client.connect();
|
||||||
|
client.subscribe("/topic", new IPublishCallback() {
|
||||||
|
|
||||||
public void published(String topic, byte[] message) {
|
public void published(String topic, byte[] message) {
|
||||||
received = true;
|
received = true;
|
||||||
}
|
}
|
||||||
});
|
});
|
||||||
client.connect(false);
|
|
||||||
client.publish("/topic", "Test my payload".getBytes());
|
|
||||||
client.close();
|
client.close();
|
||||||
|
|
||||||
//Verify
|
//Verify
|
||||||
@@ -120,109 +224,4 @@ public class ServerIntegrationTest {
|
|||||||
client.shutdown();
|
client.shutdown();
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
/**
|
|
||||||
* 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
|
|
||||||
* correctly cleanup every previous subscription
|
|
||||||
*/
|
|
||||||
@Test
|
|
||||||
public void testCleanSession_correctlyClientSubscriptions() {
|
|
||||||
Client client = new Client("localhost", Server.PORT, "CLID_123");
|
|
||||||
client.connect(false); //without session cleanup
|
|
||||||
|
|
||||||
client.subscribe("/topic", new IPublishCallback() {
|
|
||||||
|
|
||||||
public void published(String topic, byte[] message) {
|
|
||||||
received = true;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
client.close();
|
|
||||||
client.shutdown();
|
|
||||||
|
|
||||||
//Exercise that the client maintain the subscriptions
|
|
||||||
client = new Client("localhost", Server.PORT, "CLID_123");
|
|
||||||
client.register("/topic", new IPublishCallback() {
|
|
||||||
|
|
||||||
public void published(String topic, byte[] message) {
|
|
||||||
received = true;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
client.connect(true);
|
|
||||||
client.publish("/topic", "Test my payload".getBytes());
|
|
||||||
client.close();
|
|
||||||
|
|
||||||
//Verify
|
|
||||||
assertFalse(received);
|
|
||||||
|
|
||||||
//TearDown
|
|
||||||
client.shutdown();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
@Test
|
|
||||||
public void testCleanSession_maintainClientSubscriptions_withServerRestart() throws IOException {
|
|
||||||
Client client = new Client("localhost", Server.PORT, "CLID_123");
|
|
||||||
client.connect(false); //without session cleanup
|
|
||||||
|
|
||||||
client.subscribe("/topic", new IPublishCallback() {
|
|
||||||
|
|
||||||
public void published(String topic, byte[] message) {
|
|
||||||
received = true;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
client.close();
|
|
||||||
client.shutdown();
|
|
||||||
server.stopServer();
|
|
||||||
|
|
||||||
server.startServer();
|
|
||||||
|
|
||||||
//Exercise that the client maintain the subscriptions
|
|
||||||
client = new Client("localhost", Server.PORT, "CLID_123");
|
|
||||||
client.register("/topic", new IPublishCallback() {
|
|
||||||
|
|
||||||
public void published(String topic, byte[] message) {
|
|
||||||
received = true;
|
|
||||||
}
|
|
||||||
});
|
|
||||||
client.connect(false);
|
|
||||||
client.publish("/topic", "Test my payload".getBytes());
|
|
||||||
client.close();
|
|
||||||
|
|
||||||
//Verify
|
|
||||||
assertTrue(received);
|
|
||||||
|
|
||||||
//TearDown
|
|
||||||
client.shutdown();
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// @Test
|
|
||||||
// public void testRetain_maintainMessage_againstClientDestruction() {
|
|
||||||
// Client client = new Client("localhost", Server.PORT, "CLID_123");
|
|
||||||
// client.connect(false); //without session cleanup
|
|
||||||
//
|
|
||||||
// client.publish("/topic", "Test my payload".getBytes(), true);
|
|
||||||
// client.close();
|
|
||||||
// client.shutdown();
|
|
||||||
//
|
|
||||||
// //Exercise that the client maintain the subscriptions
|
|
||||||
// client = new Client("localhost", Server.PORT, "CLID_123");
|
|
||||||
// client.connect(false);
|
|
||||||
// client.subscribe("/topic", new IPublishCallback() {
|
|
||||||
//
|
|
||||||
// public void published(String topic, byte[] message) {
|
|
||||||
// received = true;
|
|
||||||
// }
|
|
||||||
// });
|
|
||||||
// client.close();
|
|
||||||
//
|
|
||||||
// //Verify
|
|
||||||
// assertTrue(received);
|
|
||||||
//
|
|
||||||
// //TearDown
|
|
||||||
// client.shutdown();
|
|
||||||
// }
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user