update samples, comment out tests that do not run against mosquitto

Change-Id: I3c4cecb8e62c23ecd037d99cc2e72833693ed60d
Signed-off-by: Seth Hoenig <seth.a.hoenig@gmail.com>

Author: shoenig

fvt/mosquitto.cfg

@@ -12,8 +12,6 @@ listener 17002
 listener 17003
 listener 17004
 
-# These certs are not supported by mosquitto (SSL 1.1+ required)
-
-capath ../samples/samplecerts
-certfile ../samples/samplecerts/server-crt.pem
-keyfile ../samples/samplecerts/server-key.pem
+#capath ../samples/samplecerts
+#certfile ../samples/samplecerts/server-crt.pem
+#keyfile ../samples/samplecerts/server-key.pem

fvt_client_test.go

@@ -37,6 +37,7 @@ func Test_Start(t *testing.T) {
 	c.Disconnect(250)
 }
 
+/* uncomment this if you have connection policy disallowing FailClientID
 func Test_InvalidConnRc(t *testing.T) {
 	ops := NewClientOptions().SetClientId("FailClientID").
 		SetBroker("tcp://" + FVT_IP + ":17003").
@@ -49,6 +50,7 @@ func Test_InvalidConnRc(t *testing.T) {
 	}
 	c.Disconnect(250)
 }
+*/
 
 // Helper function for Test_Start_Ssl
 func NewTlsConfig() *tls.Config {
@@ -72,8 +74,7 @@ func NewTlsConfig() *tls.Config {
 	}
 }
 
-// temporarily disabled b/c Seth doesn't know
-//   how to configure IMA for SSL
+/* uncomment this if you have ssl setup
 func Test_Start_Ssl(t *testing.T) {
 	tlsconfig := NewTlsConfig()
 	ops := NewClientOptions().SetClientId("StartSsl").
@@ -90,6 +91,7 @@ func Test_Start_Ssl(t *testing.T) {
 
 	c.Disconnect(250)
 }
+*/
 
 func Test_Publish_1(t *testing.T) {
 	ops := NewClientOptions()

samples/custom_store.go

@@ -80,7 +80,9 @@ func main() {
 	if err != nil {
 		panic(err)
 	}
-	c.StartSubscription(callback, "/go-mqtt/sample", MQTT.QOS_ZERO)
+
+	filter, _ := MQTT.NewTopicFilter("/go-mqtt/sample", 0)
+	c.StartSubscription(callback, filter)
 
 	for i := 0; i < 5; i++ {
 		text := fmt.Sprintf("this is msg #%d!", i)

samples/reconnect.go

@@ -14,10 +14,14 @@
 
 package main
 
-import "fmt"
-import "flag"
-import "time"
-import MQTT "git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git"
+import (
+	"flag"
+	"fmt"
+	"os"
+	"time"
+
+	MQTT "git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git"
+)
 
 /*
 Options:
@@ -159,7 +163,14 @@ func main() {
 			panic(err)
 		}
 		connected = true
-		client.StartSubscription(nil, *topic, MQTT.QoS(*qos))
+
+		filter, e := MQTT.NewTopicFilter(*topic, byte(*qos))
+		if e != nil {
+			fmt.Println(e)
+			os.Exit(1)
+		}
+
+		client.StartSubscription(nil, filter)
 
 		for num_received < *num {
 			reconnect(client, opts)

samples/routing.go

@@ -28,8 +28,9 @@ package main
 
 import (
 	"fmt"
-	MQTT "git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git"
 	"os"
+
+	MQTT "git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git"
 )
 
 var broker_load = make(chan bool)
@@ -68,21 +69,24 @@ func main() {
 		panic(err)
 	}
 
-	if receipt, err := c.StartSubscription(brokerLoadHandler, "$SYS/broker/load/#", MQTT.QOS_ZERO); err != nil {
+	loadFilter, _ := MQTT.NewTopicFilter("$SYS/broker/load/#", 0)
+	if receipt, err := c.StartSubscription(brokerLoadHandler, loadFilter); err != nil {
 		fmt.Println(err)
 		os.Exit(1)
 	} else {
 		<-receipt
 	}
 
-	if receipt, err := c.StartSubscription(brokerConnectionHandler, "$SYS/broker/connection/#", MQTT.QOS_ZERO); err != nil {
+	connectionFilter, _ := MQTT.NewTopicFilter("$SYS/broker/connection/#", 0)
+	if receipt, err := c.StartSubscription(brokerConnectionHandler, connectionFilter); err != nil {
 		fmt.Println(err)
 		os.Exit(1)
 	} else {
 		<-receipt
 	}
 
-	if receipt, err := c.StartSubscription(brokerClientsHandler, "$SYS/broker/clients/#", MQTT.QOS_ZERO); err != nil {
+	clientsFilter, _ := MQTT.NewTopicFilter("$SYS/broker/clients/#", 0)
+	if receipt, err := c.StartSubscription(brokerClientsHandler, clientsFilter); err != nil {
 		fmt.Println(err)
 		os.Exit(1)
 	} else {

samples/sample.go

@@ -14,9 +14,13 @@
 
 package main
 
-import "fmt"
-import "flag"
-import MQTT "git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git"
+import (
+	"flag"
+	"fmt"
+	"os"
+
+	MQTT "git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git"
+)
 
 /*
 Options:
@@ -126,7 +130,14 @@ func main() {
 		if err != nil {
 			panic(err)
 		}
-		client.StartSubscription(nil, *topic, MQTT.QoS(*qos))
+
+		filter, e := MQTT.NewTopicFilter(*topic, byte(*qos))
+		if e != nil {
+			fmt.Println(e)
+			os.Exit(1)
+		}
+
+		client.StartSubscription(nil, filter)
 
 		for num_received < *num {
 			incoming := <-choke

samples/simple.go

@@ -16,9 +16,10 @@ package main
 
 import (
 	"fmt"
-	MQTT "git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git"
 	"os"
 	"time"
+
+	MQTT "git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git"
 )
 
 var f MQTT.MessageHandler = func(msg MQTT.Message) {
@@ -37,7 +38,8 @@ func main() {
 		panic(err)
 	}
 
-	if receipt, err := c.StartSubscription(nil, "/go-mqtt/sample", MQTT.QOS_ZERO); err != nil {
+	filter, _ := MQTT.NewTopicFilter("/go-mqtt/sample", 0)
+	if receipt, err := c.StartSubscription(nil, filter); err != nil {
 		fmt.Println(err)
 		os.Exit(1)
 	} else {

samples/ssl.go

@@ -109,7 +109,8 @@ func main() {
 		panic(err)
 	}
 
-	c.StartSubscription(nil, "/go-mqtt/sample", MQTT.QOS_ZERO)
+	filter, _ := MQTT.NewTopicFilter("/go-mqtt/sample", 0)
+	c.StartSubscription(nil, filter)
 
 	i := 0
 	for _ = range time.Tick(time.Duration(1) * time.Second) {

samples/stdoutsub.go

@@ -22,9 +22,9 @@ import (
 	"strconv"
 	"syscall"
 	"time"
-)
 
-import MQTT "git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git"
+	MQTT "git.eclipse.org/gitroot/paho/org.eclipse.paho.mqtt.golang.git"
+)
 
 func onMessageReceived(message MQTT.Message) {
 	fmt.Printf("Received message on topic: %s\n", message.Topic())
@@ -67,7 +67,12 @@ func main() {
 		fmt.Printf("Connected to %s\n", *server)
 	}
 
-	client.StartSubscription(onMessageReceived, *topic, MQTT.QoS(*qos))
+	filter, e := MQTT.NewTopicFilter(*topic, byte(*qos))
+	if e != nil {
+		fmt.Println(e)
+		os.Exit(1)
+	}
+	client.StartSubscription(onMessageReceived, filter)
 
 	for {
 		time.Sleep(1 * time.Second)