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

Fixed a name clashing

Browse Source
This commit is contained in:
andsel
2012-08-03 16:32:21 +02:00
parent c70163f7ef
commit 5a5f723d5f
2 changed files with 54 additions and 54 deletions
Download Patch File Download Diff File Expand all files Collapse all files
parser/src/test/java/org/dna/mqtt/moquette/proto/SubscribeEncoderTest.java
+30 -24
View File
@@ -1,70 +1,76 @@
package org.dna.mqtt.moquette.proto; package org.dna.mqtt.moquette.proto;
import org.dna.mqtt.moquette.proto.UnsubscribeEncoder; import static org.dna.mqtt.moquette.proto.TestUtils.*;
import org.dna.mqtt.moquette.proto.messages.UnsubscribeMessage;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage.QOSType; import org.dna.mqtt.moquette.proto.messages.AbstractMessage.QOSType;
import org.dna.mqtt.moquette.proto.messages.SubscribeMessage;
import org.dna.mqtt.moquette.proto.messages.SubscribeMessage.Couple;
import static org.junit.Assert.*;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import static org.junit.Assert.*;
import static org.dna.mqtt.moquette.proto.TestUtils.*;
/** /**
* *
* @author andrea * @author andrea
*/ */
public class SubscribeEncoderTest { public class SubscribeEncoderTest {
UnsubscribeMessage m_msg;
UnsubscribeEncoder m_encoder; SubscribeEncoder m_encoder;
TestUtils.MockProtocolEncoderOutput m_mockProtoEncoder; TestUtils.MockProtocolEncoderOutput m_mockProtoEncoder;
@Before @Before
public void setUp() { public void setUp() {
m_encoder = new UnsubscribeEncoder(); m_encoder = new SubscribeEncoder();
m_mockProtoEncoder = new TestUtils.MockProtocolEncoderOutput(); m_mockProtoEncoder = new TestUtils.MockProtocolEncoderOutput();
m_msg = new UnsubscribeMessage();
m_msg.setMessageID(0xAABB);
} }
@Test @Test
public void testEncodeWithMultiTopic() throws Exception { public void testEncodeWithMultiTopic() throws Exception {
m_msg.setQos(QOSType.LEAST_ONE); SubscribeMessage msg = new SubscribeMessage();
msg.setQos(QOSType.LEAST_ONE);
msg.setMessageID(0xAABB);
//variable part //variable part
String topic1 = "a/b"; Couple c1 = new Couple((byte)1, "a/b");
String topic2 = "a/b/c"; Couple c2 = new Couple((byte)0, "a/b/c");
m_msg.addTopic(topic1); msg.addSubscription(c1);
m_msg.addTopic(topic2); msg.addSubscription(c2);
//Exercise //Exercise
m_encoder.encode(null, m_msg, m_mockProtoEncoder); m_encoder.encode(null, msg, m_mockProtoEncoder);
//Verify //Verify
assertEquals((byte)0xA2, (byte)m_mockProtoEncoder.getBuffer().get()); //1 byte assertEquals((byte)0x82, (byte)m_mockProtoEncoder.getBuffer().get()); //1 byte
assertEquals(18, m_mockProtoEncoder.getBuffer().get()); //remaining length assertEquals(16, m_mockProtoEncoder.getBuffer().get()); //remaining length
//verify M1ssageID //verify M1ssageID
assertEquals((byte)0xAA, m_mockProtoEncoder.getBuffer().get()); assertEquals((byte)0xAA, m_mockProtoEncoder.getBuffer().get());
assertEquals((byte)0xBB, m_mockProtoEncoder.getBuffer().get()); assertEquals((byte)0xBB, m_mockProtoEncoder.getBuffer().get());
//Variable part //Variable part
verifyString(topic1, m_mockProtoEncoder.getBuffer()); verifyString(c1.getTopic(), m_mockProtoEncoder.getBuffer());
verifyString(topic2, m_mockProtoEncoder.getBuffer()); assertEquals(c1.getQos(), m_mockProtoEncoder.getBuffer().get());
verifyString(c2.getTopic(), m_mockProtoEncoder.getBuffer());
assertEquals(c2.getQos(), m_mockProtoEncoder.getBuffer().get());
} }
@Test(expected = IllegalArgumentException.class) @Test(expected = IllegalArgumentException.class)
public void testEncode_empty_topics() throws Exception { public void testEncode_empty_subscription() throws Exception {
m_msg.setQos(QOSType.LEAST_ONE); SubscribeMessage msg = new SubscribeMessage();
msg.setQos(QOSType.LEAST_ONE);
msg.setMessageID(0xAABB);
//Exercise //Exercise
m_encoder.encode(null, m_msg, m_mockProtoEncoder); m_encoder.encode(null, msg, m_mockProtoEncoder);
} }
@Test(expected = IllegalArgumentException.class) @Test(expected = IllegalArgumentException.class)
public void testEncode_badQos() throws Exception { public void testEncode_badQos() throws Exception {
m_msg.setQos(QOSType.EXACTLY_ONCE); SubscribeMessage msg = new SubscribeMessage();
msg.setQos(QOSType.EXACTLY_ONCE);
msg.setMessageID(0xAABB);
//Exercise //Exercise
m_encoder.encode(null, m_msg, m_mockProtoEncoder); m_encoder.encode(null, msg, m_mockProtoEncoder);
} }
} }
parser/src/test/java/org/dna/mqtt/moquette/proto/UnsubscribeEncoderTest.java
+24 -30
View File
@@ -1,76 +1,70 @@
package org.dna.mqtt.moquette.proto; package org.dna.mqtt.moquette.proto;
import static org.dna.mqtt.moquette.proto.TestUtils.*; import org.dna.mqtt.moquette.proto.UnsubscribeEncoder;
import org.dna.mqtt.moquette.proto.messages.UnsubscribeMessage;
import org.dna.mqtt.moquette.proto.messages.AbstractMessage.QOSType; import org.dna.mqtt.moquette.proto.messages.AbstractMessage.QOSType;
import org.dna.mqtt.moquette.proto.messages.SubscribeMessage;
import org.dna.mqtt.moquette.proto.messages.SubscribeMessage.Couple;
import static org.junit.Assert.*;
import org.junit.Before; import org.junit.Before;
import org.junit.Test; import org.junit.Test;
import static org.junit.Assert.*;
import static org.dna.mqtt.moquette.proto.TestUtils.*;
/** /**
* *
* @author andrea * @author andrea
*/ */
public class UnsubscribeEncoderTest { public class UnsubscribeEncoderTest {
UnsubscribeMessage m_msg;
SubscribeEncoder m_encoder; UnsubscribeEncoder m_encoder;
TestUtils.MockProtocolEncoderOutput m_mockProtoEncoder; TestUtils.MockProtocolEncoderOutput m_mockProtoEncoder;
@Before @Before
public void setUp() { public void setUp() {
m_encoder = new SubscribeEncoder(); m_encoder = new UnsubscribeEncoder();
m_mockProtoEncoder = new TestUtils.MockProtocolEncoderOutput(); m_mockProtoEncoder = new TestUtils.MockProtocolEncoderOutput();
m_msg = new UnsubscribeMessage();
m_msg.setMessageID(0xAABB);
} }
@Test @Test
public void testEncodeWithMultiTopic() throws Exception { public void testEncodeWithMultiTopic() throws Exception {
SubscribeMessage msg = new SubscribeMessage(); m_msg.setQos(QOSType.LEAST_ONE);
msg.setQos(QOSType.LEAST_ONE);
msg.setMessageID(0xAABB);
//variable part //variable part
Couple c1 = new Couple((byte)1, "a/b"); String topic1 = "a/b";
Couple c2 = new Couple((byte)0, "a/b/c"); String topic2 = "a/b/c";
msg.addSubscription(c1); m_msg.addTopic(topic1);
msg.addSubscription(c2); m_msg.addTopic(topic2);
//Exercise //Exercise
m_encoder.encode(null, msg, m_mockProtoEncoder); m_encoder.encode(null, m_msg, m_mockProtoEncoder);
//Verify //Verify
assertEquals((byte)0x82, (byte)m_mockProtoEncoder.getBuffer().get()); //1 byte assertEquals((byte)0xA2, (byte)m_mockProtoEncoder.getBuffer().get()); //1 byte
assertEquals(16, m_mockProtoEncoder.getBuffer().get()); //remaining length assertEquals(18, m_mockProtoEncoder.getBuffer().get()); //remaining length
//verify M1ssageID //verify M1ssageID
assertEquals((byte)0xAA, m_mockProtoEncoder.getBuffer().get()); assertEquals((byte)0xAA, m_mockProtoEncoder.getBuffer().get());
assertEquals((byte)0xBB, m_mockProtoEncoder.getBuffer().get()); assertEquals((byte)0xBB, m_mockProtoEncoder.getBuffer().get());
//Variable part //Variable part
verifyString(c1.getTopic(), m_mockProtoEncoder.getBuffer()); verifyString(topic1, m_mockProtoEncoder.getBuffer());
assertEquals(c1.getQos(), m_mockProtoEncoder.getBuffer().get()); verifyString(topic2, m_mockProtoEncoder.getBuffer());
verifyString(c2.getTopic(), m_mockProtoEncoder.getBuffer());
assertEquals(c2.getQos(), m_mockProtoEncoder.getBuffer().get());
} }
@Test(expected = IllegalArgumentException.class) @Test(expected = IllegalArgumentException.class)
public void testEncode_empty_subscription() throws Exception { public void testEncode_empty_topics() throws Exception {
SubscribeMessage msg = new SubscribeMessage(); m_msg.setQos(QOSType.LEAST_ONE);
msg.setQos(QOSType.LEAST_ONE);
msg.setMessageID(0xAABB);
//Exercise //Exercise
m_encoder.encode(null, msg, m_mockProtoEncoder); m_encoder.encode(null, m_msg, m_mockProtoEncoder);
} }
@Test(expected = IllegalArgumentException.class) @Test(expected = IllegalArgumentException.class)
public void testEncode_badQos() throws Exception { public void testEncode_badQos() throws Exception {
SubscribeMessage msg = new SubscribeMessage(); m_msg.setQos(QOSType.EXACTLY_ONCE);
msg.setQos(QOSType.EXACTLY_ONCE);
msg.setMessageID(0xAABB);
//Exercise //Exercise
m_encoder.encode(null, msg, m_mockProtoEncoder); m_encoder.encode(null, m_msg, m_mockProtoEncoder);
} }
} }