[broker-23] organize imports, refactor tests

Author: crazyrokr

src/main/java/com/ss/mqtt/broker/service/impl/SimpleSubscriptionService.java

@@ -2,6 +2,9 @@
 
 import static com.ss.mqtt.broker.model.ActionResult.EMPTY;
 import static com.ss.mqtt.broker.model.ActionResult.FAILED;
+import static com.ss.mqtt.broker.model.reason.code.SubscribeAckReasonCode.SHARED_SUBSCRIPTIONS_NOT_SUPPORTED;
+import static com.ss.mqtt.broker.model.reason.code.SubscribeAckReasonCode.UNSPECIFIED_ERROR;
+import static com.ss.mqtt.broker.model.reason.code.SubscribeAckReasonCode.WILDCARD_SUBSCRIPTIONS_NOT_SUPPORTED;
 import static com.ss.mqtt.broker.model.reason.code.UnsubscribeAckReasonCode.*;
 import static com.ss.mqtt.broker.util.TopicUtils.*;
 import com.ss.mqtt.broker.model.*;
@@ -61,11 +64,11 @@ public class SimpleSubscriptionService implements SubscriptionService {
         if (session == null) {
             return null;
         } else if (!config.isSharedSubscriptionAvailable() && isShared(topic)) {
-            return SubscribeAckReasonCode.SHARED_SUBSCRIPTIONS_NOT_SUPPORTED;
+            return SHARED_SUBSCRIPTIONS_NOT_SUPPORTED;
         } else if (!config.isWildcardSubscriptionAvailable() && hasWildcard(topic)) {
-            return SubscribeAckReasonCode.WILDCARD_SUBSCRIPTIONS_NOT_SUPPORTED;
+            return WILDCARD_SUBSCRIPTIONS_NOT_SUPPORTED;
         } else if (isInvalid(topic)) {
-            return SubscribeAckReasonCode.UNSPECIFIED_ERROR;
+            return UNSPECIFIED_ERROR;
         } else {
             session.addSubscriber(subscribe);
             topicSubscribers.addSubscriber(client, subscribe);
@@ -91,7 +94,7 @@ public class SimpleSubscriptionService implements SubscriptionService {
         if (session == null) {
             return null;
         } else if (isInvalid(topic)) {
-            return UNSPECIFIED_ERROR;
+            return UnsubscribeAckReasonCode.UNSPECIFIED_ERROR;
         } else if (topicSubscribers.removeSubscriber(client, topic)) {
             session.removeSubscriber(topic);
             return SUCCESS;

src/test/groovy/com/ss/mqtt/broker/test/model/TopicTest.groovy

@@ -9,7 +9,7 @@ import static com.ss.mqtt.broker.util.TopicUtils.*
 class TopicTest extends Specification {
 
     @Unroll
-    def "should create topic name: #stringTopicName"(String stringTopicName, int levelsCount) {
+    def "should create topic name: [#stringTopicName]"() {
         when:
             def topicName = buildTopicName(stringTopicName)
         then:
@@ -23,11 +23,9 @@ class TopicTest extends Specification {
     }
 
     @Unroll
-    def "should fail create topic name: #stringTopicName"(String stringTopicName) {
-        when:
-            def topicName = buildTopicName(stringTopicName)
-        then:
-            isInvalid(topicName)
+    def "should fail create topic name: [#stringTopicName]"() {
+        expect:
+            isInvalid(buildTopicName(stringTopicName))
         where:
             stringTopicName << [
                 "",
@@ -37,7 +35,7 @@ class TopicTest extends Specification {
     }
 
     @Unroll
-    def "should create topic filter: #stringTopicFilter"(String stringTopicFilter, int levelsCount) {
+    def "should create topic filter: [#stringTopicFilter]"() {
         when:
             def topicFilter = buildTopicFilter(stringTopicFilter)
         then:
@@ -53,11 +51,9 @@ class TopicTest extends Specification {
     }
 
     @Unroll
-    def "should fail create topic filter: #stringTopicFilter"(String stringTopicFilter) {
-        when:
-            def topicFilter = buildTopicFilter(stringTopicFilter)
-        then:
-            isInvalid(topicFilter)
+    def "should fail create topic filter: [#stringTopicFilter]"() {
+        expect:
+            isInvalid(buildTopicFilter(stringTopicFilter))
         where:
             stringTopicFilter << [
                 "",
@@ -71,7 +67,7 @@ class TopicTest extends Specification {
     }
 
     @Unroll
-    def "should match topicFilter[#topicFilter] with topicName[#topicName]"(String topicFilter, String topicName) {
+    def "should match topic filter: [#topicFilter] with topic name: [#topicName]"() {
         expect:
             buildTopicName(topicName).match(buildTopicFilter(topicFilter))
         where:
@@ -83,7 +79,7 @@ class TopicTest extends Specification {
     }
 
     @Unroll
-    def "should not match topicFilter[#topicFilter] with topicName[#topicName]"(String topicFilter, String topicName) {
+    def "should not match topic filter: [#topicFilter] with topic name: [#topicName]"() {
         expect:
             !buildTopicName(topicName).match(buildTopicFilter(topicFilter))
         where:

src/test/groovy/com/ss/mqtt/broker/test/util/TopicUtilsTest.groovy

@@ -9,7 +9,7 @@ import static com.ss.mqtt.broker.util.TopicUtils.*
 class TopicUtilsTest extends Specification {
 
     @Unroll
-    def "should create valid topic name: #topicName"(String topicName) {
+    def "should create valid topic name: [#topicName]"() {
         expect:
             !isInvalid(buildTopicName(topicName))
         where:
@@ -19,7 +19,7 @@ class TopicUtilsTest extends Specification {
     }
 
     @Unroll
-    def "should create valid topic filter: #topicFilter"(String topicFilter) {
+    def "should create valid topic filter: [#topicFilter]"() {
         expect:
             !isInvalid(buildTopicFilter(topicFilter))
         where:
@@ -31,7 +31,7 @@ class TopicUtilsTest extends Specification {
     }
 
     @Unroll
-    def "should detect invalid topic name: #topicName"(String topicName) {
+    def "should detect invalid topic name: [#topicName]"() {
         expect:
             isInvalid(buildTopicName(topicName))
         where:
@@ -43,7 +43,7 @@ class TopicUtilsTest extends Specification {
     }
 
     @Unroll
-    def "should detect invalid topic filter: #topicFilter"(String topicFilter) {
+    def "should detect invalid topic filter: [#topicFilter]"() {
         expect:
             isInvalid(buildTopicFilter(topicFilter))
         where: