From 27c5d7587181f28651a55a0aabcdc96f420cd10a Mon Sep 17 00:00:00 2001
From: "selva.andre" <selva.andre@gmail.com>
Date: Tue, 2 Sep 2014 23:11:05 +0200
Subject: [PATCH 1/2] Added basic connect-close TCK from Prashant Khanal

---
 .gitignore                                    |  6 ++
 broker/pom.xml                                | 39 +++++++++++
 .../mqtt/moquette/server/ConnectionIT.java    | 65 +++++++++++++++++++
 .../moquette/server/connect.then.close.rpt    | 62 ++++++++++++++++++
 4 files changed, 172 insertions(+)
 create mode 100644 broker/src/test/java/org/dna/mqtt/moquette/server/ConnectionIT.java
 create mode 100644 broker/src/test/scripts/org/dna/mqtt/moquette/server/connect.then.close.rpt

diff --git a/.gitignore b/.gitignore
index d4932f1e..552eb122 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,9 @@ broker/runner
 /bundle/runner/
 *~
 *log*
+.DS_Store
+.settings/
+.project
+.classpath
+*.swp
+
diff --git a/broker/pom.xml b/broker/pom.xml
index 945d4a03..f0c32794 100644
--- a/broker/pom.xml
+++ b/broker/pom.xml
@@ -124,6 +124,12 @@
             <version>4.8.2</version>
             <scope>test</scope>
         </dependency>
+        <dependency>
+			<groupId>org.kaazing</groupId>
+			<artifactId>robot.junit</artifactId>
+			<version>0.0.0.12</version>
+			<scope>test</scope>
+		</dependency>
         
         <!-- needs extra dependencies: objenesis & hamcrest -->
         <dependency>
@@ -176,6 +182,39 @@
                 </configuration>
             </plugin>
             
+            <plugin>
+				<groupId>org.kaazing</groupId>
+				<artifactId>robot-maven-plugin</artifactId>
+				<version>0.0.0.12</version>
+				<configuration>
+					<skipTests>${skipITs}</skipTests>
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>start</goal>
+							<goal>stop</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<artifactId>maven-failsafe-plugin</artifactId>
+				<version>2.17</version>
+				<configuration>
+					<skipTests>${skipITs}</skipTests>
+				</configuration>
+				<executions>
+					<execution>
+						<goals>
+							<goal>integration-test</goal>
+							<goal>verify</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+            
+            
 <!--            <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
diff --git a/broker/src/test/java/org/dna/mqtt/moquette/server/ConnectionIT.java b/broker/src/test/java/org/dna/mqtt/moquette/server/ConnectionIT.java
new file mode 100644
index 00000000..944260ab
--- /dev/null
+++ b/broker/src/test/java/org/dna/mqtt/moquette/server/ConnectionIT.java
@@ -0,0 +1,65 @@
+/*
+ * Copyright (c) 2012-2014 The original author or authors
+ * ------------------------------------------------------
+ * All rights reserved. This program and the accompanying materials
+ * are made available under the terms of the Eclipse Public License v1.0
+ * and Apache License v2.0 which accompanies this distribution.
+ *
+ * The Eclipse Public License is available at
+ * http://www.eclipse.org/legal/epl-v10.html
+ *
+ * The Apache License v2.0 is available at
+ * http://www.opensource.org/licenses/apache2.0.php
+ *
+ * You may elect to redistribute this code under either of these licenses.
+ */
+package org.dna.mqtt.moquette.server;
+
+import java.io.IOException;
+
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Rule;
+import org.junit.Test;
+import org.kaazing.robot.junit.annotation.Robotic;
+import org.kaazing.robot.junit.rules.RobotRule;
+
+/**
+ * This class runs the robot test scripts to run the TCK for Moquette  broker, before  remember to run
+ * mvn -Dmaven.robot.daemon=false robot:start from broker submodule folder
+ *
+ *
+ * @author pkhanal
+ * 
+ */
+public class ConnectionIT {
+	
+	@Rule
+    public RobotRule robot = new RobotRule();
+	
+	Server m_server;
+	
+    protected void startServer() throws IOException {
+        m_server = new Server();
+        m_server.startServer();
+    }
+
+    @Before
+    public void setUp() throws Exception {
+        startServer();
+    }
+
+    @After
+    public void tearDown() throws Exception {
+        m_server.stopServer();
+    }
+	
+	// The test starts the server during setUp
+    // The network communication is driven by the script.
+    @Robotic(script = "connect.then.close")
+    @Test(timeout = 1000)
+    public void shouldConnectThenClose() throws Exception {
+    	robot.join();
+    }
+
+}
diff --git a/broker/src/test/scripts/org/dna/mqtt/moquette/server/connect.then.close.rpt b/broker/src/test/scripts/org/dna/mqtt/moquette/server/connect.then.close.rpt
new file mode 100644
index 00000000..315c7ed5
--- /dev/null
+++ b/broker/src/test/scripts/org/dna/mqtt/moquette/server/connect.then.close.rpt
@@ -0,0 +1,62 @@
+# Copyright (c) 2012-2014 The original author or authors
+# ------------------------------------------------------
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# and Apache License v2.0 which accompanies this distribution.
+#
+# The Eclipse Public License is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# The Apache License v2.0 is available at
+# http://www.opensource.org/licenses/apache2.0.php
+#
+# You may elect to redistribute this code under either of these licenses.
+
+# MQTT 3.1.1
+
+# Script that sends the CONNECT control packet to broker and expects 
+# CONNACK control packet from the broker followed by sending the DISCONNECT 
+# control packet to the broker and expects server to close the network connection
+
+connect tcp://127.0.0.1:1883
+connected
+
+# CONNECT
+write [0x10] 			# MQTT Control Packet type(1)
+write [0x12]        	# Remaining Length
+write [0x00 0x04]    	# Protocol Name Length
+write "MQTT" 			# Protocol Name
+write [0x04] 			# The value of the Protocol Level field for the version 3.1.1 of the protocol is 4 (0x04)
+
+			 			# Connect Flags
+		     			# User Name Flag(0)
+             			# Password Flag(0)
+write [0x02] 			# Will Retain(0)
+             			# Will QoS(00)
+             			# Will Flag(0)
+             			# Clean Session(1)
+             			# Reserved(0)
+
+write [0x00 0x00]   	# Keep Alive
+
+			    		# Payload
+write [0x00 0x07]    		# Client Identifier Length
+write "client1"         # Client Identifier
+
+# CONNACK
+read [0x20] 			# MQTT Control Packet type(2)
+read [0x02]        		# Remaining Length
+
+						# Connect Acknowledge Flags
+read [0x00]        		# Session Present Flag(0)
+
+						# Connect Return code
+read [0x00]				# Connection Accepted
+
+
+# DISCONNECT
+write [0xE0] 			# MQTT Control Packet type(14)
+write [0x00]            # Remaining Length
+
+# Server MUST close the Network Connection
+closed

From b792e3695df51e0e8a490658b453fd81a9c85227 Mon Sep 17 00:00:00 2001
From: "selva.andre" <selva.andre@gmail.com>
Date: Sun, 7 Sep 2014 10:32:12 +0200
Subject: [PATCH 2/2] Applied patch
 0001-Moved-spec-tests-to-different-package.-Added-spec-te.patch from Prashant
 for Will behaviour

---
 .../v3_1_1/connection}/ConnectionIT.java      | 26 ++++++--
 broker/src/test/resources/log4j.properties    |  4 +-
 .../moquette/server/connect.then.close.rpt    | 62 ------------------
 .../v3_1_1/connection/connect.then.close.rpt  | 63 +++++++++++++++++++
 ...set.to.zero.but.WillQoS.set.to.nonzero.rpt | 47 ++++++++++++++
 .../connect.with.invalid.WillQoS.rpt          | 46 ++++++++++++++
 6 files changed, 179 insertions(+), 69 deletions(-)
 rename broker/src/test/java/org/dna/mqtt/moquette/{server => spec/v3_1_1/connection}/ConnectionIT.java (65%)
 delete mode 100644 broker/src/test/scripts/org/dna/mqtt/moquette/server/connect.then.close.rpt
 create mode 100644 broker/src/test/scripts/org/dna/mqtt/moquette/spec/v3_1_1/connection/connect.then.close.rpt
 create mode 100644 broker/src/test/scripts/org/dna/mqtt/moquette/spec/v3_1_1/connection/connect.with.WillFlag.set.to.zero.but.WillQoS.set.to.nonzero.rpt
 create mode 100644 broker/src/test/scripts/org/dna/mqtt/moquette/spec/v3_1_1/connection/connect.with.invalid.WillQoS.rpt

diff --git a/broker/src/test/java/org/dna/mqtt/moquette/server/ConnectionIT.java b/broker/src/test/java/org/dna/mqtt/moquette/spec/v3_1_1/connection/ConnectionIT.java
similarity index 65%
rename from broker/src/test/java/org/dna/mqtt/moquette/server/ConnectionIT.java
rename to broker/src/test/java/org/dna/mqtt/moquette/spec/v3_1_1/connection/ConnectionIT.java
index 944260ab..aed48466 100644
--- a/broker/src/test/java/org/dna/mqtt/moquette/server/ConnectionIT.java
+++ b/broker/src/test/java/org/dna/mqtt/moquette/spec/v3_1_1/connection/ConnectionIT.java
@@ -13,21 +13,20 @@
  *
  * You may elect to redistribute this code under either of these licenses.
  */
-package org.dna.mqtt.moquette.server;
+package org.dna.mqtt.moquette.spec.v3_1_1.connection;
 
 import java.io.IOException;
 
+import org.dna.mqtt.moquette.server.Server;
 import org.junit.After;
 import org.junit.Before;
 import org.junit.Rule;
+import org.junit.Ignore;
 import org.junit.Test;
 import org.kaazing.robot.junit.annotation.Robotic;
 import org.kaazing.robot.junit.rules.RobotRule;
 
 /**
- * This class runs the robot test scripts to run the TCK for Moquette  broker, before  remember to run
- * mvn -Dmaven.robot.daemon=false robot:start from broker submodule folder
- *
  *
  * @author pkhanal
  * 
@@ -57,9 +56,26 @@ public class ConnectionIT {
 	// The test starts the server during setUp
     // The network communication is driven by the script.
     @Robotic(script = "connect.then.close")
-    @Test(timeout = 1000)
+    @Test(timeout = 2000)
     public void shouldConnectThenClose() throws Exception {
     	robot.join();
     }
+    
+    // TODO: server is not closing the connection immediately. 
+    // The connection is closed 10 seconds after the CorruptedFrameException is 
+    // thrown from ConnectDecoder
+    @Robotic(script = "connect.with.invalid.WillQoS")
+    @Test(timeout = 15000)
+    public void connectWithInvalidWillQoS() throws Exception {
+    	robot.join();
+    }
+    
+    
+    @Ignore("Need to validate the test case.")
+    @Robotic(script = "connect.with.WillFlag.set.to.zero.but.WillQoS.set.to.nonzero")
+    @Test(timeout = 15000)
+    public void connectWithWillFlagSetToZeroButWillQoSFlagSetToNonZero() throws Exception {
+    	robot.join();
+    }
 
 }
diff --git a/broker/src/test/resources/log4j.properties b/broker/src/test/resources/log4j.properties
index e0f3c5bf..ccdb6fc4 100644
--- a/broker/src/test/resources/log4j.properties
+++ b/broker/src/test/resources/log4j.properties
@@ -19,9 +19,9 @@ log4j.logger.org.dna.mqtt.moquette.parser.netty=WARN
 
 # stdout appender is set to be a ConsoleAppender.
 log4j.appender.stdout=org.apache.log4j.ConsoleAppender
-log4j.appender.stdout.Threshold=WARN
+#log4j.appender.stdout.Threshold=WARN
 #log4j.appender.stdout.Threshold=INFO
-#log4j.appender.stdout.Threshold=DEBUG
+log4j.appender.stdout.Threshold=DEBUG
 # for debug trace
 #log4j.appender.stdout.Threshold=TRACE 
 log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
diff --git a/broker/src/test/scripts/org/dna/mqtt/moquette/server/connect.then.close.rpt b/broker/src/test/scripts/org/dna/mqtt/moquette/server/connect.then.close.rpt
deleted file mode 100644
index 315c7ed5..00000000
--- a/broker/src/test/scripts/org/dna/mqtt/moquette/server/connect.then.close.rpt
+++ /dev/null
@@ -1,62 +0,0 @@
-# Copyright (c) 2012-2014 The original author or authors
-# ------------------------------------------------------
-# All rights reserved. This program and the accompanying materials
-# are made available under the terms of the Eclipse Public License v1.0
-# and Apache License v2.0 which accompanies this distribution.
-#
-# The Eclipse Public License is available at
-# http://www.eclipse.org/legal/epl-v10.html
-#
-# The Apache License v2.0 is available at
-# http://www.opensource.org/licenses/apache2.0.php
-#
-# You may elect to redistribute this code under either of these licenses.
-
-# MQTT 3.1.1
-
-# Script that sends the CONNECT control packet to broker and expects 
-# CONNACK control packet from the broker followed by sending the DISCONNECT 
-# control packet to the broker and expects server to close the network connection
-
-connect tcp://127.0.0.1:1883
-connected
-
-# CONNECT
-write [0x10] 			# MQTT Control Packet type(1)
-write [0x12]        	# Remaining Length
-write [0x00 0x04]    	# Protocol Name Length
-write "MQTT" 			# Protocol Name
-write [0x04] 			# The value of the Protocol Level field for the version 3.1.1 of the protocol is 4 (0x04)
-
-			 			# Connect Flags
-		     			# User Name Flag(0)
-             			# Password Flag(0)
-write [0x02] 			# Will Retain(0)
-             			# Will QoS(00)
-             			# Will Flag(0)
-             			# Clean Session(1)
-             			# Reserved(0)
-
-write [0x00 0x00]   	# Keep Alive
-
-			    		# Payload
-write [0x00 0x07]    		# Client Identifier Length
-write "client1"         # Client Identifier
-
-# CONNACK
-read [0x20] 			# MQTT Control Packet type(2)
-read [0x02]        		# Remaining Length
-
-						# Connect Acknowledge Flags
-read [0x00]        		# Session Present Flag(0)
-
-						# Connect Return code
-read [0x00]				# Connection Accepted
-
-
-# DISCONNECT
-write [0xE0] 			# MQTT Control Packet type(14)
-write [0x00]            # Remaining Length
-
-# Server MUST close the Network Connection
-closed
diff --git a/broker/src/test/scripts/org/dna/mqtt/moquette/spec/v3_1_1/connection/connect.then.close.rpt b/broker/src/test/scripts/org/dna/mqtt/moquette/spec/v3_1_1/connection/connect.then.close.rpt
new file mode 100644
index 00000000..dbd401e9
--- /dev/null
+++ b/broker/src/test/scripts/org/dna/mqtt/moquette/spec/v3_1_1/connection/connect.then.close.rpt
@@ -0,0 +1,63 @@
+
+# Copyright (c) 2012-2014 The original author or authors
+# ------------------------------------------------------
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# and Apache License v2.0 which accompanies this distribution.
+#
+# The Eclipse Public License is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# The Apache License v2.0 is available at
+# http://www.opensource.org/licenses/apache2.0.php
+#
+# You may elect to redistribute this code under either of these licenses.
+
+# MQTT 3.1.1
+
+# Script that sends the CONNECT control packet to broker and expects 
+# CONNACK control packet from the broker followed by sending the DISCONNECT 
+# control packet to the broker and expects server to close the network connection
+
+connect tcp://127.0.0.1:1883
+connected
+
+# CONNECT
+write [0x10]            # MQTT Control Packet type(1)
+write [0x12]            # Remaining Length
+write [0x00 0x04]       # Protocol Name Length
+write "MQTT"            # Protocol Name
+write [0x04]            # The value of the Protocol Level field for the version 3.1.1 of the protocol is 4 (0x04)
+
+                        # Connect Flags
+                        # User Name Flag(0)
+                        # Password Flag(0)
+                        # Will Retain(0)
+                        # Will QoS(00)
+                        # Will Flag(0)
+                        # Clean Session(1)
+write [0x02]            # Reserved(0)
+
+write [0x00 0x00]       # Keep Alive
+
+                        # Payload
+write [0x00 0x07]       # Client Identifier Length
+write "client1"         # Client Identifier
+
+# CONNACK
+read [0x20]             # MQTT Control Packet type(2)
+read [0x02]             # Remaining Length
+
+                        # Connect Acknowledge Flags
+read [0x00]             # Session Present Flag(0)
+
+                        # Connect Return code
+read [0x00]             # Connection Accepted
+
+
+# DISCONNECT
+write [0xE0]            # MQTT Control Packet type(14)
+write [0x00]            # Remaining Length
+
+# Server MUST close the Network Connection
+closed
\ No newline at end of file
diff --git a/broker/src/test/scripts/org/dna/mqtt/moquette/spec/v3_1_1/connection/connect.with.WillFlag.set.to.zero.but.WillQoS.set.to.nonzero.rpt b/broker/src/test/scripts/org/dna/mqtt/moquette/spec/v3_1_1/connection/connect.with.WillFlag.set.to.zero.but.WillQoS.set.to.nonzero.rpt
new file mode 100644
index 00000000..670fb189
--- /dev/null
+++ b/broker/src/test/scripts/org/dna/mqtt/moquette/spec/v3_1_1/connection/connect.with.WillFlag.set.to.zero.but.WillQoS.set.to.nonzero.rpt
@@ -0,0 +1,47 @@
+# Copyright (c) 2012-2014 The original author or authors
+# ------------------------------------------------------
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# and Apache License v2.0 which accompanies this distribution.
+#
+# The Eclipse Public License is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# The Apache License v2.0 is available at
+# http://www.opensource.org/licenses/apache2.0.php
+#
+# You may elect to redistribute this code under either of these licenses.
+
+# MQTT 3.1.1
+
+# Script that sends the CONNECT control packet to broker with Will Flag is set to 0 but 
+# Will QoS flag set to non-zero(1). As per the spec, If the Will Flag is set to 0, then 
+# the Will QoS MUST be set to 0. Serve should close the network connection in this case.
+
+connect tcp://127.0.0.1:1883
+connected
+
+# CONNECT
+write [0x10]            # MQTT Control Packet type(1)
+write [0x12]            # Remaining Length
+write [0x00 0x04]       # Protocol Name Length
+write "MQTT"            # Protocol Name
+write [0x04]            # The value of the Protocol Level field for the version 3.1.1 of the protocol is 4 (0x04)
+
+                        # Connect Flags
+                        # User Name Flag(0)
+                        # Password Flag(0)
+                        # Will Retain(0)
+                        # Will QoS(01) - If the Will Flag is set to 0, then the Will QoS MUST be set to 0
+                        # Will Flag(0)
+                        # Clean Session(1)
+write [0x0A]            # Reserved(0)
+
+write [0x00 0x00]       # Keep Alive
+
+                        # Payload
+write [0x00 0x07]       # Client Identifier Length
+write "client1"         # Client Identifier
+
+# Server MUST close the Network Connection due to invalid Will QoS flag
+closed
\ No newline at end of file
diff --git a/broker/src/test/scripts/org/dna/mqtt/moquette/spec/v3_1_1/connection/connect.with.invalid.WillQoS.rpt b/broker/src/test/scripts/org/dna/mqtt/moquette/spec/v3_1_1/connection/connect.with.invalid.WillQoS.rpt
new file mode 100644
index 00000000..f377ec97
--- /dev/null
+++ b/broker/src/test/scripts/org/dna/mqtt/moquette/spec/v3_1_1/connection/connect.with.invalid.WillQoS.rpt
@@ -0,0 +1,46 @@
+# Copyright (c) 2012-2014 The original author or authors
+# ------------------------------------------------------
+# All rights reserved. This program and the accompanying materials
+# are made available under the terms of the Eclipse Public License v1.0
+# and Apache License v2.0 which accompanies this distribution.
+#
+# The Eclipse Public License is available at
+# http://www.eclipse.org/legal/epl-v10.html
+#
+# The Apache License v2.0 is available at
+# http://www.opensource.org/licenses/apache2.0.php
+#
+# You may elect to redistribute this code under either of these licenses.
+
+# MQTT 3.1.1
+
+# Script that sends the CONNECT control packet to broker with invalid Will QoS - 3 
+# and expects the broker to close the network connection.
+
+connect tcp://127.0.0.1:1883
+connected
+
+# CONNECT
+write [0x10]            # MQTT Control Packet type(1)
+write [0x12]            # Remaining Length
+write [0x00 0x04]       # Protocol Name Length
+write "MQTT"            # Protocol Name
+write [0x04]            # The value of the Protocol Level field for the version 3.1.1 of the protocol is 4 (0x04)
+
+                        # Connect Flags
+                        # User Name Flag(0)
+                        # Password Flag(0)
+                        # Will Retain(0)
+                        # Will QoS(11) - It MUST NOT be 3 (0x03). Serve should close the connection.
+                        # Will Flag(1)
+                        # Clean Session(1)
+write [0x1E]            # Reserved(0)
+
+write [0x00 0x00]       # Keep Alive
+
+                        # Payload
+write [0x00 0x07]       # Client Identifier Length
+write "client1"         # Client Identifier
+
+# Server MUST close the Network Connection due to invalid Will QoS flag
+closed
\ No newline at end of file