events: remove waitgroup on Publish, add Destroy test
This commit is contained in:
parent
45418c86dd
commit
764aed89ae
|
@ -104,17 +104,13 @@ func (b *Bus) Publish(topic string, data interface{}) {
|
|||
return
|
||||
}
|
||||
|
||||
var wg sync.WaitGroup
|
||||
event := Event{Topic: topic, Data: data}
|
||||
for _, listener := range listeners {
|
||||
l := listener
|
||||
wg.Add(1)
|
||||
go func(l Listener, event Event) {
|
||||
defer wg.Done()
|
||||
l <- event
|
||||
}(l, event)
|
||||
}
|
||||
wg.Wait()
|
||||
}
|
||||
|
||||
// Destroy destroys the Event Bus by unregistering and closing all listeners.
|
||||
|
|
|
@ -168,3 +168,58 @@ func TestBus_Publish(t *testing.T) {
|
|||
})
|
||||
})
|
||||
}
|
||||
|
||||
func TestBus_Destroy(t *testing.T) {
|
||||
g := Goblin(t)
|
||||
|
||||
g.Describe("Destroy", func() {
|
||||
g.It("unsubscribes and closes all listeners", func() {
|
||||
bus := NewBus()
|
||||
|
||||
listener := make(chan Event)
|
||||
bus.On(listener, "test")
|
||||
|
||||
done := make(chan struct{}, 1)
|
||||
go func() {
|
||||
select {
|
||||
case m := <-listener:
|
||||
g.Assert(m).IsZero()
|
||||
case <-time.After(1 * time.Second):
|
||||
g.Fail("listener did not receive message in time")
|
||||
}
|
||||
done <- struct{}{}
|
||||
}()
|
||||
bus.Destroy()
|
||||
<-done
|
||||
|
||||
g.Assert(bus.listeners).Equal(map[string][]Listener{})
|
||||
})
|
||||
|
||||
// This is a check that ensures Destroy only closes each listener
|
||||
// channel once, even if it is subscribed to multiple topics.
|
||||
//
|
||||
// Closing a channel multiple times will cause a runtime panic, which
|
||||
// I'm pretty sure we don't want.
|
||||
g.It("unsubscribes and closes channel only once", func() {
|
||||
bus := NewBus()
|
||||
|
||||
listener := make(chan Event)
|
||||
bus.On(listener, "test", "test2", "test3", "test4", "test5")
|
||||
|
||||
done := make(chan struct{}, 1)
|
||||
go func() {
|
||||
select {
|
||||
case m := <-listener:
|
||||
g.Assert(m).IsZero()
|
||||
case <-time.After(1 * time.Second):
|
||||
g.Fail("listener did not receive message in time")
|
||||
}
|
||||
done <- struct{}{}
|
||||
}()
|
||||
bus.Destroy()
|
||||
<-done
|
||||
|
||||
g.Assert(bus.listeners).Equal(map[string][]Listener{})
|
||||
})
|
||||
})
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue
Block a user