1
0
mirror of https://github.com/go-mqtt/mqtt.git synced 2025-08-07 11:42:52 +03:00

Testing Helper needs to be on each function, including the nested ones.

This commit is contained in:
Pascal S. de Kloe
2021-03-17 15:08:43 +01:00
parent 71f9744a9c
commit 0471dd4192

View File

@@ -38,12 +38,16 @@ func NewReadSlicesMock(t testing.TB, want ...Transfer) func() (message, topic []
var wantIndex uint64 var wantIndex uint64
t.Cleanup(func() { t.Cleanup(func() {
t.Helper()
if n := uint64(len(want)) - atomic.LoadUint64(&wantIndex); n > 0 { if n := uint64(len(want)) - atomic.LoadUint64(&wantIndex); n > 0 {
t.Errorf("want %d more MQTT ReadSlices", n) t.Errorf("want %d more MQTT ReadSlices", n)
} }
}) })
return func() (message, topic []byte, err error) { return func() (message, topic []byte, err error) {
t.Helper()
i := atomic.AddUint64(&wantIndex, 1) - 1 i := atomic.AddUint64(&wantIndex, 1) - 1
if i >= uint64(len(want)) { if i >= uint64(len(want)) {
err = errors.New("unwanted MQTT ReadSlices") err = errors.New("unwanted MQTT ReadSlices")
@@ -69,6 +73,8 @@ func NewPublishMock(t testing.TB, want ...Transfer) func(quit <-chan struct{}, m
}) })
return func(quit <-chan struct{}, message []byte, topic string) error { return func(quit <-chan struct{}, message []byte, topic string) error {
t.Helper()
select { select {
case <-quit: case <-quit:
return mqtt.ErrCanceled return mqtt.ErrCanceled
@@ -228,6 +234,7 @@ func newSubscribeMock(name string, t testing.TB, want ...Filter) func(quit <-cha
}) })
return func(quit <-chan struct{}, topicFilters ...string) error { return func(quit <-chan struct{}, topicFilters ...string) error {
t.Helper()
if len(topicFilters) == 0 { if len(topicFilters) == 0 {
t.Fatalf("MQTT %s without topic filters", name) t.Fatalf("MQTT %s without topic filters", name)
} }