Moved the overrideSubscription test from SubscriptionsStoreTest to a new test case named ClientSession. Removed a parameter in ClientSession.subscribe method. topicFilter param had no use but for logging purposes.
This commit is contained in:
@@ -94,9 +94,9 @@ public class ClientSession {
|
|||||||
return "ClientSession{clientID='" + clientID + '\'' +"}";
|
return "ClientSession{clientID='" + clientID + '\'' +"}";
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean subscribe(String topicFilter, Subscription newSubscription) {
|
public boolean subscribe(Subscription newSubscription) {
|
||||||
LOG.info("<{}> subscribed to topicFilter <{}> with QoS {}",
|
LOG.info("<{}> subscribed to the topic filter <{}> with QoS {}",
|
||||||
newSubscription.getClientId(), topicFilter,
|
newSubscription.getClientId(), newSubscription.getTopicFilter(),
|
||||||
AbstractMessage.QOSType.formatQoS(newSubscription.getRequestedQos()));
|
AbstractMessage.QOSType.formatQoS(newSubscription.getRequestedQos()));
|
||||||
boolean validTopic = SubscriptionsStore.validate(newSubscription.getTopicFilter());
|
boolean validTopic = SubscriptionsStore.validate(newSubscription.getTopicFilter());
|
||||||
if (!validTopic) {
|
if (!validTopic) {
|
||||||
|
|||||||
@@ -715,7 +715,7 @@ public class ProtocolProcessor {
|
|||||||
|
|
||||||
AbstractMessage.QOSType qos = AbstractMessage.QOSType.valueOf(req.qos);
|
AbstractMessage.QOSType qos = AbstractMessage.QOSType.valueOf(req.qos);
|
||||||
Subscription newSubscription = new Subscription(clientID, req.topicFilter, qos);
|
Subscription newSubscription = new Subscription(clientID, req.topicFilter, qos);
|
||||||
boolean valid = clientSession.subscribe(req.topicFilter, newSubscription);
|
boolean valid = clientSession.subscribe(newSubscription);
|
||||||
ackMessage.addType(valid ? qos : AbstractMessage.QOSType.FAILURE);
|
ackMessage.addType(valid ? qos : AbstractMessage.QOSType.FAILURE);
|
||||||
if (valid) {
|
if (valid) {
|
||||||
newSubscriptions.add(newSubscription);
|
newSubscriptions.add(newSubscription);
|
||||||
|
|||||||
@@ -0,0 +1,54 @@
|
|||||||
|
package io.moquette.spi;
|
||||||
|
|
||||||
|
import io.moquette.parser.proto.messages.AbstractMessage;
|
||||||
|
import io.moquette.spi.impl.MemoryStorageService;
|
||||||
|
import io.moquette.spi.impl.subscriptions.Subscription;
|
||||||
|
import io.moquette.spi.impl.subscriptions.SubscriptionsStore;
|
||||||
|
import org.junit.Before;
|
||||||
|
import org.junit.Test;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import static org.junit.Assert.assertEquals;
|
||||||
|
|
||||||
|
/**
|
||||||
|
* Created by nedermail on 17/07/16.
|
||||||
|
*/
|
||||||
|
public class ClientSessionTest {
|
||||||
|
|
||||||
|
ClientSession session1;
|
||||||
|
ClientSession session2;
|
||||||
|
ISessionsStore sessionsStore;
|
||||||
|
SubscriptionsStore store;
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void setUp() {
|
||||||
|
store = new SubscriptionsStore();
|
||||||
|
MemoryStorageService storageService = new MemoryStorageService();
|
||||||
|
storageService.initStore();
|
||||||
|
this.sessionsStore = storageService.sessionsStore();
|
||||||
|
store.init(sessionsStore);
|
||||||
|
|
||||||
|
session1 = sessionsStore.createNewSession("SESSION_ID_1", true);
|
||||||
|
session2 = sessionsStore.createNewSession("SESSION_ID_2", true);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void overridingSubscriptions() {
|
||||||
|
// Subscribe on /topic with QOSType.MOST_ONE
|
||||||
|
Subscription oldSubscription = new Subscription(session1.clientID, "/topic", AbstractMessage.QOSType.MOST_ONE);
|
||||||
|
session1.subscribe(oldSubscription);
|
||||||
|
store.add(oldSubscription.asClientTopicCouple());
|
||||||
|
|
||||||
|
// Subscribe on /topic again that overrides the previous subscription.
|
||||||
|
Subscription overrindingSubscription = new Subscription(session1.clientID, "/topic", AbstractMessage.QOSType.EXACTLY_ONCE);
|
||||||
|
session1.subscribe(overrindingSubscription);
|
||||||
|
store.add(overrindingSubscription.asClientTopicCouple());
|
||||||
|
|
||||||
|
//Verify
|
||||||
|
List<Subscription> subscriptions = store.matches("/topic");
|
||||||
|
assertEquals(1, subscriptions.size());
|
||||||
|
Subscription sub = subscriptions.get(0);
|
||||||
|
assertEquals(overrindingSubscription.getRequestedQos(), sub.getRequestedQos());
|
||||||
|
}
|
||||||
|
}
|
||||||
+3
-21
@@ -397,24 +397,6 @@ public class SubscriptionsStoreTest {
|
|||||||
assertEquals(slashSub.getClientId(), remainedSubscription.getClientId());
|
assertEquals(slashSub.getClientId(), remainedSubscription.getClientId());
|
||||||
}
|
}
|
||||||
|
|
||||||
//TODO this test has to be moved on ClientSession, it's not part of subscription logic
|
|
||||||
@Test
|
|
||||||
public void overridingSubscriptions() {
|
|
||||||
ClientSession session = sessionsStore.createNewSession("FAKE_CLI_ID_1", true);
|
|
||||||
Subscription oldSubscription = new Subscription("FAKE_CLI_ID_1", "/topic", AbstractMessage.QOSType.MOST_ONE);
|
|
||||||
session.subscribe("/topic", oldSubscription);
|
|
||||||
store.add(oldSubscription.asClientTopicCouple());
|
|
||||||
Subscription overrindingSubscription = new Subscription("FAKE_CLI_ID_1", "/topic", AbstractMessage.QOSType.EXACTLY_ONCE);
|
|
||||||
session.subscribe("/topic", overrindingSubscription);
|
|
||||||
store.add(overrindingSubscription.asClientTopicCouple());
|
|
||||||
|
|
||||||
//Verify
|
|
||||||
List<Subscription> subscriptions = store.matches("/topic");
|
|
||||||
assertEquals(1, subscriptions.size());
|
|
||||||
Subscription sub = subscriptions.get(0);
|
|
||||||
assertEquals(overrindingSubscription.getRequestedQos(), sub.getRequestedQos());
|
|
||||||
}
|
|
||||||
|
|
||||||
/*
|
/*
|
||||||
Test for Issue #49
|
Test for Issue #49
|
||||||
* */
|
* */
|
||||||
@@ -422,15 +404,15 @@ public class SubscriptionsStoreTest {
|
|||||||
public void duplicatedSubscriptionsWithDifferentQos() {
|
public void duplicatedSubscriptionsWithDifferentQos() {
|
||||||
ClientSession session2 = sessionsStore.createNewSession("client2", true);
|
ClientSession session2 = sessionsStore.createNewSession("client2", true);
|
||||||
Subscription client2Sub = new Subscription("client2", "client/test/b", AbstractMessage.QOSType.MOST_ONE);
|
Subscription client2Sub = new Subscription("client2", "client/test/b", AbstractMessage.QOSType.MOST_ONE);
|
||||||
session2.subscribe("client/test/b", client2Sub);
|
session2.subscribe(client2Sub);
|
||||||
store.add(client2Sub.asClientTopicCouple());
|
store.add(client2Sub.asClientTopicCouple());
|
||||||
ClientSession session1 = sessionsStore.createNewSession("client1", true);
|
ClientSession session1 = sessionsStore.createNewSession("client1", true);
|
||||||
Subscription client1SubQoS0 = new Subscription("client1", "client/test/b", AbstractMessage.QOSType.MOST_ONE);
|
Subscription client1SubQoS0 = new Subscription("client1", "client/test/b", AbstractMessage.QOSType.MOST_ONE);
|
||||||
session1.subscribe("client/test/b", client1SubQoS0);
|
session1.subscribe(client1SubQoS0);
|
||||||
store.add(client1SubQoS0.asClientTopicCouple());
|
store.add(client1SubQoS0.asClientTopicCouple());
|
||||||
|
|
||||||
Subscription client1SubQoS2 = new Subscription("client1", "client/test/b", AbstractMessage.QOSType.EXACTLY_ONCE);
|
Subscription client1SubQoS2 = new Subscription("client1", "client/test/b", AbstractMessage.QOSType.EXACTLY_ONCE);
|
||||||
session1.subscribe("client/test/b", client1SubQoS2);
|
session1.subscribe(client1SubQoS2);
|
||||||
store.add(client1SubQoS2.asClientTopicCouple());
|
store.add(client1SubQoS2.asClientTopicCouple());
|
||||||
|
|
||||||
System.out.println(store.dumpTree());
|
System.out.println(store.dumpTree());
|
||||||
|
|||||||
@@ -68,12 +68,16 @@ public class MapDBPersistentStoreTest {
|
|||||||
|
|
||||||
@Test
|
@Test
|
||||||
public void overridingSubscriptions() {
|
public void overridingSubscriptions() {
|
||||||
ClientSession session1 = m_sessionsStore.createNewSession("FAKE_CLI_ID_1", true);
|
ClientSession session1 = m_sessionsStore.createNewSession("SESSION_ID_1", true);
|
||||||
Subscription oldSubscription = new Subscription("FAKE_CLI_ID_1", "/topic", AbstractMessage.QOSType.MOST_ONE);
|
|
||||||
session1.subscribe("/topic", oldSubscription);
|
// Subscribe on /topic with QOSType.MOST_ONE
|
||||||
Subscription overrindingSubscription = new Subscription("FAKE_CLI_ID_1", "/topic", AbstractMessage.QOSType.EXACTLY_ONCE);
|
Subscription oldSubscription = new Subscription(session1.clientID, "/topic", AbstractMessage.QOSType.MOST_ONE);
|
||||||
session1.subscribe("/topic", overrindingSubscription);
|
session1.subscribe(oldSubscription);
|
||||||
|
|
||||||
|
// Subscribe on /topic again that overrides the previous subscription.
|
||||||
|
Subscription overrindingSubscription = new Subscription(session1.clientID, "/topic", AbstractMessage.QOSType.EXACTLY_ONCE);
|
||||||
|
session1.subscribe(overrindingSubscription);
|
||||||
|
|
||||||
//Verify
|
//Verify
|
||||||
List<ClientTopicCouple> subscriptions = m_sessionsStore.listAllSubscriptions();
|
List<ClientTopicCouple> subscriptions = m_sessionsStore.listAllSubscriptions();
|
||||||
assertEquals(1, subscriptions.size());
|
assertEquals(1, subscriptions.size());
|
||||||
|
|||||||
Reference in New Issue
Block a user