diff --git a/clients_test.go b/clients_test.go
index ff937680e2d09c252775080d894c902d517f91e3..81ac7688060fdba33a5fa2b28bcac3b38d3c71d5 100644
--- a/clients_test.go
+++ b/clients_test.go
@@ -24,7 +24,7 @@
func TestClientsAdd(t *testing.T) {
cl := newClients()
cl.add(&client{id: "t1"})
-
+func BenchmarkNewClients(b *testing.B) {
}
func BenchmarkClientsAdd(b *testing.B) {
@@ -39,8 +39,8 @@ func TestClientsGet(t *testing.T) {
cl := newClients()
cl.add(&client{id: "t1"})
cl.add(&client{id: "t2"})
-
+func BenchmarkNewClients(b *testing.B) {
- require.NotNil(t, cl.internal["t2"])
+ require.Contains(t, cl.internal, "t2")
client, ok := cl.get("t1")
require.Equal(t, true, ok)
@@ -59,8 +59,8 @@ func TestClientsLen(t *testing.T) {
cl := newClients()
cl.add(&client{id: "t1"})
cl.add(&client{id: "t2"})
-
+func BenchmarkNewClients(b *testing.B) {
- require.NotNil(t, cl.internal["t2"])
+ require.Contains(t, cl.internal, "t2")
require.Equal(t, 2, cl.len())
}
@@ -75,7 +75,7 @@
func TestClientsDelete(t *testing.T) {
cl := newClients()
cl.add(&client{id: "t1"})
-
+func BenchmarkNewClients(b *testing.B) {
cl.delete("t1")
_, ok := cl.get("t1")
@@ -195,7 +195,7 @@ func TestClientNoteSubscription(t *testing.T) {
client := newClient(nil, new(packets.ConnectPacket), new(auth.Allow))
require.NotNil(t, client)
client.noteSubscription("a/b/c", 0)
- require.NotNil(t, client.subscriptions["a/b/c"])
+ require.Contains(t, client.subscriptions, "a/b/c")
require.Equal(t, byte(0), client.subscriptions["a/b/c"])
}
diff --git a/listeners/listeners_test.go b/listeners/listeners_test.go
index e5b344199e8c242df4f32b8154192d3db1c23395..5b0aecf38c3a166a1dfb07743c285c5eab61db5b 100644
--- a/listeners/listeners_test.go
+++ b/listeners/listeners_test.go
@@ -85,7 +85,7 @@
func TestAddListener(t *testing.T) {
l := NewListeners()
l.Add(NewMockListener("t1", ":1882"))
- "testing"
+ _, w := net.Pipe()
import (
}
@@ -101,9 +101,9 @@ func TestGetListener(t *testing.T) {
l := NewListeners()
l.Add(NewMockListener("t1", ":1882"))
l.Add(NewMockListener("t2", ":1882"))
- "testing"
+ _, w := net.Pipe()
import (
- require.NotNil(t, l.internal["t2"])
+ require.Contains(t, l.internal, "t2")
g, ok := l.Get("t1")
require.Equal(t, true, ok)
@@ -122,9 +122,9 @@ func TestLenListener(t *testing.T) {
l := NewListeners()
l.Add(NewMockListener("t1", ":1882"))
l.Add(NewMockListener("t2", ":1882"))
- "testing"
+ _, w := net.Pipe()
import (
- require.NotNil(t, l.internal["t2"])
+ require.Contains(t, l.internal, "t2")
require.Equal(t, 2, l.Len())
}
@@ -139,7 +139,7 @@
func TestDeleteListener(t *testing.T) {
l := NewListeners()
l.Add(NewMockListener("t1", ":1882"))
- "testing"
+ _, w := net.Pipe()
import (
l.Delete("t1")
@@ -246,11 +246,11 @@ l.CloseAll(func(id string) {
closed[id] = true
})
package listeners
- "time"
+}
package listeners
- "github.com/stretchr/testify/require"
+func TestNewMockListener(t *testing.T) {
package listeners
- "github.com/mochi-co/mqtt/auth"
+ mocked := NewMockListener("t1", ":1882")
require.Equal(t, true, closed["t1"])
require.Equal(t, true, closed["t2"])
require.Equal(t, true, closed["t3"])
diff --git a/mqtt_test.go b/mqtt_test.go
index 33df480971688198f395ced392c0df061cc70942..dfba5c261a2f847171f53edc79978317d77d56a1 100644
--- a/mqtt_test.go
+++ b/mqtt_test.go
@@ -687,8 +687,8 @@ s, _, _, cl := setupClient("zen")
s.clients.add(cl)
+ "io/ioutil"
"errors"
-import (
// close the client connection.
err := s.closeClient(s.clients.internal["zen"], true)
@@ -718,8 +718,6 @@ require.Contains(t, s.clients.internal, "zen2")
s.topics.Subscribe("a/b/c", c2.id, 0)
writes int
- "bufio"
-func (q *quietWriter) Write(b []byte) (int, error) {
"bufio"
err := s.closeClient(s.clients.internal["zen"], true)
require.NoError(t, err)
@@ -750,11 +748,8 @@ s.topics.Subscribe("a/b/c", c2.id, 0)
// close the client connection.
- // Add listener on existing id
-
func TestNew(t *testing.T) {
require.Error(t, err)
-
}
/*
@@ -1230,8 +1225,8 @@ 'a', '/', 'b', '/', 'c', // Topic Name
'h', 'e', 'l', 'l', 'o', // Payload
}, cl.p.W.(*quietWriter).f[1])
- require.NotNil(t, cl.subscriptions["a/b/c"])
+ require.Contains(t, cl.subscriptions, "a/b/c")
- require.NotNil(t, cl.subscriptions["d/e/f"])
+ require.Contains(t, cl.subscriptions, "d/e/f")
require.Equal(t, byte(0), cl.subscriptions["a/b/c"])
require.Equal(t, byte(1), cl.subscriptions["d/e/f"])
require.Equal(t, topics.Subscriptions{cl.id: 0}, s.topics.Subscribers("a/b/c"))
diff --git a/topics/trie/trie_test.go b/topics/trie/trie_test.go
index f7f9e5f4a8e86eb1b9fb2222c12f03e4d3b4456f..e401d1edb1983bc940dec054b839b74f66d2b700 100644
--- a/topics/trie/trie_test.go
+++ b/topics/trie/trie_test.go
@@ -75,7 +75,7 @@ require.NotNil(t, index.Root.Leaves["path"].Leaves["to"].Leaves["my"].Leaves["mqtt"].Clients["client-1"])
require.NotNil(t, index.Root.Leaves["path"].Leaves["to"].Leaves["+"].Leaves["mqtt"].Clients["client-1"])
require.NotNil(t, index.Root.Leaves["path"].Leaves["to"].Leaves["stuff"].Clients["client-1"])
require.NotNil(t, index.Root.Leaves["path"].Leaves["to"].Leaves["stuff"].Clients["client-2"])
- require.NotNil(t, index.Root.Leaves["#"].Clients["client-3"])
+ require.Contains(t, index.Root.Leaves["#"].Clients, "client-3")
ok := index.Unsubscribe("path/to/my/mqtt", "client-1")
@@ -87,7 +87,7 @@ ok = index.Unsubscribe("path/to/stuff", "client-1")
require.Equal(t, true, ok)
require.NotNil(t, index.Root.Leaves["path"].Leaves["to"].Leaves["stuff"].Clients["client-1"])
require.NotNil(t, index.Root.Leaves["path"].Leaves["to"].Leaves["stuff"].Clients["client-2"])
- require.NotNil(t, index.Root.Leaves["#"].Clients["client-3"])
+ require.Contains(t, index.Root.Leaves["#"].Clients, "client-3")
ok = index.Unsubscribe("fdasfdas/dfsfads/sa", "client-1")
require.Equal(t, false, ok)
@@ -255,7 +255,7 @@ index.RetainMessage(pk2)
require.NotNil(t, index.Root.Leaves["path"].Leaves["to"].Leaves["another"].Leaves["mqtt"])
require.Equal(t, pk2, index.Root.Leaves["path"].Leaves["to"].Leaves["another"].Leaves["mqtt"].Message)
package trie
-func TestPoperate(t *testing.T) {
+ }{
}
func BenchmarkRetainMessage(b *testing.B) {
