anna/IM-server-new
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Minor refact, moved Channel's attributesKey accessible by utils methods

Browse Source
This commit is contained in:
andsel
2016-01-24 19:21:24 +01:00
parent 43371d3068
commit 3be2667844
5 changed files with 80 additions and 44 deletions
Download Patch File Download Diff File Expand all files Collapse all files
broker/src/test/java/io/moquette/spi/impl/ProtocolProcessorTest.java
+15 -15
View File
@@ -130,7 +130,7 @@ public class ProtocolProcessorTest {
msg.setQos(QOSType.MOST_ONE);
msg.setPayload(buffer);
msg.setRetainFlag(false);
m_session.attr(NettyUtils.ATTR_KEY_USERNAME).set("FakeCLI");
NettyUtils.userName(m_session, "FakeCLI");
m_processor.processPublish(m_session, msg);
//Verify
@@ -189,7 +189,7 @@ public class ProtocolProcessorTest {
msg.setQos(QOSType.MOST_ONE);
msg.setPayload(buffer);
msg.setRetainFlag(false);
m_session.attr(NettyUtils.ATTR_KEY_USERNAME).set("FakeCLI");
NettyUtils.userName(m_session, "FakeCLI");
m_processor.processPublish(m_session, msg);
@@ -210,8 +210,8 @@ public class ProtocolProcessorTest {
//Exercise
SubscribeMessage msg = new SubscribeMessage();
msg.addSubscription(new SubscribeMessage.Couple(AbstractMessage.QOSType.MOST_ONE.byteValue(), FAKE_TOPIC));
m_session.attr(NettyUtils.ATTR_KEY_CLIENTID).set(FAKE_CLIENT_ID);
m_session.attr(NettyUtils.ATTR_KEY_CLEANSESSION).set(false);
NettyUtils.clientID(m_session, FAKE_CLIENT_ID);
NettyUtils.cleanSession(m_session, false);
m_sessionStore.createNewSession(FAKE_CLIENT_ID, false);
m_processor.processSubscribe(m_session, msg);
@@ -225,8 +225,8 @@ public class ProtocolProcessorTest {
public void testDoubleSubscribe() {
SubscribeMessage msg = new SubscribeMessage();
msg.addSubscription(new SubscribeMessage.Couple(AbstractMessage.QOSType.MOST_ONE.byteValue(), FAKE_TOPIC));
m_session.attr(NettyUtils.ATTR_KEY_CLIENTID).set(FAKE_CLIENT_ID);
m_session.attr(NettyUtils.ATTR_KEY_CLEANSESSION).set(false);
NettyUtils.clientID(m_session, FAKE_CLIENT_ID);
NettyUtils.cleanSession(m_session, false);
m_sessionStore.createNewSession(FAKE_CLIENT_ID, false);
assertEquals(0, subscriptions.size());
@@ -246,8 +246,8 @@ public class ProtocolProcessorTest {
public void testSubscribeWithBadFormattedTopic() {
SubscribeMessage msg = new SubscribeMessage();
msg.addSubscription(new SubscribeMessage.Couple(AbstractMessage.QOSType.MOST_ONE.byteValue(), BAD_FORMATTED_TOPIC));
m_session.attr(NettyUtils.ATTR_KEY_CLIENTID).set(FAKE_CLIENT_ID);
m_session.attr(NettyUtils.ATTR_KEY_CLEANSESSION).set(false);
NettyUtils.clientID(m_session, FAKE_CLIENT_ID);
NettyUtils.cleanSession(m_session, false);
m_sessionStore.createNewSession(FAKE_CLIENT_ID, false);
assertEquals(0, subscriptions.size());
@@ -271,8 +271,8 @@ public class ProtocolProcessorTest {
UnsubscribeMessage msg = new UnsubscribeMessage();
msg.setMessageID(1);
msg.addTopicFilter(BAD_FORMATTED_TOPIC);
m_session.attr(NettyUtils.ATTR_KEY_CLIENTID).set(FAKE_CLIENT_ID);
m_session.attr(NettyUtils.ATTR_KEY_CLEANSESSION).set(false);
NettyUtils.clientID(m_session, FAKE_CLIENT_ID);
NettyUtils.cleanSession(m_session, false);
//Exercise
m_processor.processUnsubscribe(m_session, msg);
@@ -317,9 +317,9 @@ public class ProtocolProcessorTest {
pubmsg.setQos(QOSType.MOST_ONE);
pubmsg.setPayload(buffer);
pubmsg.setRetainFlag(true);
m_session.attr(NettyUtils.ATTR_KEY_CLIENTID).set(FAKE_PUBLISHER_ID);
NettyUtils.clientID(m_session, FAKE_PUBLISHER_ID);
m_processor.processPublish(m_session, pubmsg);
m_session.attr(NettyUtils.ATTR_KEY_CLEANSESSION).set(false);
NettyUtils.cleanSession(m_session, false);
//Exercise
SubscribeMessage msg = new SubscribeMessage();
@@ -377,7 +377,7 @@ public class ProtocolProcessorTest {
msg.setQos(QOSType.MOST_ONE);
msg.setPayload(buffer);
msg.setRetainFlag(true);
m_session.attr(NettyUtils.ATTR_KEY_CLIENTID).set("Publisher");
NettyUtils.clientID(m_session, "Publisher");
m_processor.processPublish(m_session, msg);
//Verify no message is received
@@ -404,7 +404,7 @@ public class ProtocolProcessorTest {
msg.setQos(QOSType.MOST_ONE);
msg.setPayload(buffer);
msg.setRetainFlag(true);
m_session.attr(NettyUtils.ATTR_KEY_CLIENTID).set("Publisher");
NettyUtils.clientID(m_session, "Publisher");
m_processor.processPublish(m_session, msg);
//Verify no message is received
@@ -422,7 +422,7 @@ public class ProtocolProcessorTest {
connMsg.setClientID("Publisher");
m_processor.processConnect(m_session, connMsg);
//prepare and existing retained store
m_session.attr(NettyUtils.ATTR_KEY_CLIENTID).set("Publisher");
NettyUtils.clientID(m_session, "Publisher");
ByteBuffer payload = ByteBuffer.allocate(5).put("Hello".getBytes());
PublishMessage msg = new PublishMessage();
msg.setTopicName(FAKE_TOPIC);
broker/src/test/java/io/moquette/spi/impl/ProtocolProcessor_CONNECT_Test.java
+4 -4
View File
@@ -246,8 +246,8 @@ public class ProtocolProcessor_CONNECT_Test {
connMsg.setProtocolVersion(VERSION_3_1_1);
connMsg.setClientID("CliID");
connMsg.setCleanSession(false);
m_session.attr(NettyUtils.ATTR_KEY_CLIENTID).set("CliID");
m_session.attr(NettyUtils.ATTR_KEY_CLIENTID).set(false);
NettyUtils.clientID(m_session, "CliID");
NettyUtils.cleanSession(m_session, false);
//Connect a first time
m_processor.processConnect(m_session, connMsg);
@@ -277,8 +277,8 @@ public class ProtocolProcessor_CONNECT_Test {
SubscribeMessage subscribeMsg = new SubscribeMessage();
subscribeMsg.addSubscription(new SubscribeMessage.Couple((byte) AbstractMessage.QOSType.MOST_ONE.ordinal(),
ProtocolProcessorTest.FAKE_TOPIC));
m_session.attr(NettyUtils.ATTR_KEY_CLIENTID).set("CliID");
m_session.attr(NettyUtils.ATTR_KEY_CLEANSESSION).set(false);
NettyUtils.clientID(m_session, "CliID");
NettyUtils.cleanSession(m_session, false);
m_processor.processSubscribe(m_session, subscribeMsg);
Subscription expectedSubscription = new Subscription("CliID", ProtocolProcessorTest.FAKE_TOPIC,
AbstractMessage.QOSType.MOST_ONE);