Add test for ExpandTopics

OSSystems · Apr 18, 2017 · e8bb2f7 · e8bb2f7
1 parent a51ef6b
commit e8bb2f7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 7 deletions.
diff --git a/broker_test.go b/broker_test.go
@@ -11,7 +11,7 @@ import (
 )
 
 func TestSubscribe(t *testing.T) {
-	subscriber, _ := NewSubscriber()
+	subscriber := NewSubscriber()
 	subscriber.Topics = []string{"topic"}
 
 	broker := NewBroker()
@@ -30,7 +30,7 @@ func TestSubscribe(t *testing.T) {
 func TestUnsubscribe(t *testing.T) {
 	topic := "topic"
 
-	subscriber, _ := NewSubscriber()
+	subscriber := NewSubscriber()
 	subscriber.Topics = []string{topic}
 
 	broker := NewBroker()
@@ -44,7 +44,7 @@ func TestPublish(t *testing.T) {
 	topics := []string{"topic1", "topic2"}
 	published := []string{}
 
-	subscriber, _ := NewSubscriber()
+	subscriber := NewSubscriber()
 	subscriber.Topics = topics
 
 	monkey.PatchInstanceMethod(reflect.TypeOf(subscriber), "Receiver", func(_ *Subscriber, topic string, payload []byte) {

diff --git a/subscriber.go b/subscriber.go
@@ -29,9 +29,8 @@ type SubscriberHooks struct {
 	OnPublish   string `yaml:"OnPublish"`
 }
 
-func NewSubscriber() (*Subscriber, error) {
-	subscriber := &Subscriber{}
-	return subscriber, nil
+func NewSubscriber() *Subscriber {
+	return &Subscriber{}
 }
 
 func (s *Subscriber) Receiver(topic string, payload []byte) {
@@ -124,7 +123,7 @@ func LoadSubscribers(path string) ([]*Subscriber, error) {
 	subscribers := []*Subscriber{}
 
 	for _, file := range files {
-		subscriber, _ := NewSubscriber()
+		subscriber := NewSubscriber()
 
 		data, err := ioutil.ReadFile(file)
 		if err != nil {