From 9df60774a7471a6d33bc9ce5bd0147fa2e397c9f Mon Sep 17 00:00:00 2001 From: andsel Date: Thu, 22 Nov 2018 22:16:44 +0100 Subject: [PATCH] Fixed failing tests --- .../main/java/io/moquette/broker/IRetainedRepository.java | 3 ++- .../java/io/moquette/broker/MemoryRetainedRepository.java | 2 +- .../broker/subscriptions/CTrieSubscriptionDirectory.java | 7 +------ .../broker/subscriptions/ISubscriptionsDirectory.java | 2 -- .../java/io/moquette/broker/PostOfficePublishTest.java | 4 ++-- .../io/moquette/broker/config/ConfigurationParserTest.java | 3 ++- .../integration/ServerIntegrationWebSocketTest.java | 2 +- .../io/moquette/spec/v3_1_1/connection/ConnectionIT.java | 2 ++ 8 files changed, 11 insertions(+), 14 deletions(-) diff --git a/broker/src/main/java/io/moquette/broker/IRetainedRepository.java b/broker/src/main/java/io/moquette/broker/IRetainedRepository.java index 79121256..11af4d54 100644 --- a/broker/src/main/java/io/moquette/broker/IRetainedRepository.java +++ b/broker/src/main/java/io/moquette/broker/IRetainedRepository.java @@ -19,11 +19,12 @@ import io.moquette.broker.subscriptions.Topic; import io.netty.handler.codec.mqtt.MqttPublishMessage; public interface IRetainedRepository { + void cleanRetained(Topic topic); void retain(Topic topic, MqttPublishMessage msg); - boolean isEmtpy(); + boolean isEmpty(); MqttPublishMessage retainedOnTopic(String topic); } diff --git a/broker/src/main/java/io/moquette/broker/MemoryRetainedRepository.java b/broker/src/main/java/io/moquette/broker/MemoryRetainedRepository.java index 17d5ae87..206a3784 100644 --- a/broker/src/main/java/io/moquette/broker/MemoryRetainedRepository.java +++ b/broker/src/main/java/io/moquette/broker/MemoryRetainedRepository.java @@ -39,7 +39,7 @@ final class MemoryRetainedRepository implements IRetainedRepository { } @Override - public boolean isEmtpy() { + public boolean isEmpty() { return storage.isEmpty(); } diff --git a/broker/src/main/java/io/moquette/broker/subscriptions/CTrieSubscriptionDirectory.java b/broker/src/main/java/io/moquette/broker/subscriptions/CTrieSubscriptionDirectory.java index 72874dc6..87ce38b9 100644 --- a/broker/src/main/java/io/moquette/broker/subscriptions/CTrieSubscriptionDirectory.java +++ b/broker/src/main/java/io/moquette/broker/subscriptions/CTrieSubscriptionDirectory.java @@ -79,11 +79,6 @@ public class CTrieSubscriptionDirectory implements ISubscriptionsDirectory { return Optional.of(inode.mainNode()); } - @Override - public List matches(Topic topic) { - return new ArrayList<>(matchQosSharpening(topic)); - } - /** * Given a topic string return the clients subscriptions that matches it. Topic string can't * contain character # and + because they are reserved to listeners subscriptions, and not topic @@ -113,7 +108,7 @@ public class CTrieSubscriptionDirectory implements ISubscriptionsDirectory { return new HashSet<>(subsGroupedByClient.values()); } - Set recursiveMatch(Topic topic, INode inode) { + private Set recursiveMatch(Topic topic, INode inode) { CNode cnode = inode.mainNode(); if (Token.MULTI.equals(cnode.token)) { return cnode.subscriptions; diff --git a/broker/src/main/java/io/moquette/broker/subscriptions/ISubscriptionsDirectory.java b/broker/src/main/java/io/moquette/broker/subscriptions/ISubscriptionsDirectory.java index a9957d74..9f67db2d 100644 --- a/broker/src/main/java/io/moquette/broker/subscriptions/ISubscriptionsDirectory.java +++ b/broker/src/main/java/io/moquette/broker/subscriptions/ISubscriptionsDirectory.java @@ -32,8 +32,6 @@ public interface ISubscriptionsDirectory { void removeSubscription(Topic topic, String clientID); - List matches(Topic topic); - int size(); String dumpTree(); diff --git a/broker/src/test/java/io/moquette/broker/PostOfficePublishTest.java b/broker/src/test/java/io/moquette/broker/PostOfficePublishTest.java index 52aa9540..aa740a40 100644 --- a/broker/src/test/java/io/moquette/broker/PostOfficePublishTest.java +++ b/broker/src/test/java/io/moquette/broker/PostOfficePublishTest.java @@ -241,7 +241,7 @@ public class PostOfficePublishTest { .topicName(NEWS_TOPIC).build()); // Verify - assertTrue("QoS0 MUST clean retained message for topic", retainedRepository.isEmtpy()); + assertTrue("QoS0 MUST clean retained message for topic", retainedRepository.isEmpty()); } @Test @@ -403,7 +403,7 @@ public class PostOfficePublishTest { .topicName(NEWS_TOPIC).build()); // Verify - assertTrue("Retained message for topic /news must be cleared", retainedRepository.isEmtpy()); + assertTrue("Retained message for topic /news must be cleared", retainedRepository.isEmpty()); } private void assertMessageIsRetained(String expectedTopicName) { diff --git a/broker/src/test/java/io/moquette/broker/config/ConfigurationParserTest.java b/broker/src/test/java/io/moquette/broker/config/ConfigurationParserTest.java index e07a7f98..87e233b0 100644 --- a/broker/src/test/java/io/moquette/broker/config/ConfigurationParserTest.java +++ b/broker/src/test/java/io/moquette/broker/config/ConfigurationParserTest.java @@ -16,13 +16,14 @@ package io.moquette.broker.config; -import io.moquette.broker.config.ConfigurationParser; import org.junit.Before; import org.junit.Test; + import java.io.Reader; import java.io.StringReader; import java.text.ParseException; import java.util.Properties; + import static org.junit.Assert.assertEquals; import static org.junit.Assert.assertTrue; diff --git a/broker/src/test/java/io/moquette/integration/ServerIntegrationWebSocketTest.java b/broker/src/test/java/io/moquette/integration/ServerIntegrationWebSocketTest.java index c0aed55c..1147c387 100644 --- a/broker/src/test/java/io/moquette/integration/ServerIntegrationWebSocketTest.java +++ b/broker/src/test/java/io/moquette/integration/ServerIntegrationWebSocketTest.java @@ -62,8 +62,8 @@ public class ServerIntegrationWebSocketTest { @After public void tearDown() throws Exception { client.stop(); - m_server.stopServer(); + IntegrationUtils.clearTestStorage(); } @SuppressWarnings("FutureReturnValueIgnored") diff --git a/broker/src/test/java/io/moquette/spec/v3_1_1/connection/ConnectionIT.java b/broker/src/test/java/io/moquette/spec/v3_1_1/connection/ConnectionIT.java index 88697e79..ef286816 100644 --- a/broker/src/test/java/io/moquette/spec/v3_1_1/connection/ConnectionIT.java +++ b/broker/src/test/java/io/moquette/spec/v3_1_1/connection/ConnectionIT.java @@ -22,6 +22,7 @@ import static org.junit.Assert.assertTrue; import java.io.File; import java.io.IOException; import io.moquette.BrokerConstants; +import io.moquette.integration.IntegrationUtils; import io.moquette.testclient.RawClient; import org.junit.After; import org.junit.Before; @@ -53,6 +54,7 @@ public class ConnectionIT { dbFile.delete()); } assertFalse(dbFile.exists()); + IntegrationUtils.clearTestStorage(); } @Test(timeout = 3000)