Skip to content

Commit 026fd03

Browse files
gen2thomasgen2thomas
authored
test: try to stabilize eventer tests (hybridgroup#1066)
1 parent 244f699 commit 026fd03

File tree

68 files changed

+140
-133
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

68 files changed

+140
-133
lines changed

‎drivers/aio/analog_sensor_driver_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ func TestAnalogSensor_WithSensorCyclicRead(t *testing.T) {
193193
select {
194194
case <-semDone:
195195
case <-time.After(readTimeout):
196-
t.Errorf("AnalogSensor Event \"Data\" was not published")
196+
require.Fail(t, "AnalogSensor Event \"Data\" was not published")
197197
}
198198

199199
// arrange: for error to be received
@@ -206,7 +206,7 @@ func TestAnalogSensor_WithSensorCyclicRead(t *testing.T) {
206206
select {
207207
case <-semDone:
208208
case <-time.After(readTimeout):
209-
t.Errorf("AnalogSensor Event \"Error\" was not published")
209+
require.Fail(t, "AnalogSensor Event \"Error\" was not published")
210210
}
211211

212212
// arrange: for halt message
@@ -224,9 +224,9 @@ func TestAnalogSensor_WithSensorCyclicRead(t *testing.T) {
224224
// assert: no event
225225
select {
226226
case <-semData:
227-
t.Errorf("AnalogSensor Event for data should not published")
227+
require.Fail(t, "AnalogSensor Event for data should not published")
228228
case <-semDone:
229-
t.Errorf("AnalogSensor Event for value should not published")
229+
require.Fail(t, "AnalogSensor Event for value should not published")
230230
case <-time.After(readTimeout):
231231
}
232232
}

‎drivers/aio/grove_drivers_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ func TestGroveDriverHalt_WithSensorCyclicRead(t *testing.T) {
153153
time.Sleep(20 * time.Millisecond)
154154
// note: if a reading is already in progress, it will be finished before halt have an impact
155155
if atomic.LoadInt32(&callCount) > lastCallCount+1 {
156-
t.Errorf("AnalogRead was called more than once after driver was halted")
156+
require.Fail(t, "AnalogRead was called more than once after driver was halted")
157157
}
158158
}
159159
}
@@ -188,7 +188,7 @@ func TestGroveDriverWithSensorCyclicReadPublishesError(t *testing.T) {
188188
select {
189189
case <-sem:
190190
case <-time.After(time.Second):
191-
t.Errorf("%s Event \"Error\" was not published", groveGetType(driver))
191+
require.Fail(t, "%s Event \"Error\" was not published", groveGetType(driver))
192192
}
193193

194194
// Cleanup

‎drivers/aio/grove_temperature_sensor_driver_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -116,7 +116,7 @@ func TestGroveTemperatureSensor_publishesTemperatureInCelsius(t *testing.T) {
116116
select {
117117
case <-sem:
118118
case <-time.After(1 * time.Second):
119-
t.Errorf("Grove Temperature Sensor Event \"Value\" was not published")
119+
require.Fail(t, "Grove Temperature Sensor Event \"Value\" was not published")
120120
}
121121

122122
assert.InDelta(t, 31.61532462352477, d.Temperature(), 0.0)

‎drivers/aio/temperature_sensor_driver_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -149,7 +149,7 @@ func TestTemperatureSensorWithSensorCyclicRead_PublishesTemperatureInCelsius(t *
149149
select {
150150
case <-sem:
151151
case <-time.After(1 * time.Second):
152-
t.Errorf(" Temperature Sensor Event \"Data\" was not published")
152+
require.Fail(t, " Temperature Sensor Event \"Data\" was not published")
153153
}
154154

155155
assert.InDelta(t, 31.61532462352477, d.Value(), 0.0)
@@ -177,7 +177,7 @@ func TestTemperatureSensorWithSensorCyclicRead_PublishesError(t *testing.T) {
177177
select {
178178
case <-sem:
179179
case <-time.After(1 * time.Second):
180-
t.Errorf(" Temperature Sensor Event \"Error\" was not published")
180+
require.Fail(t, " Temperature Sensor Event \"Error\" was not published")
181181
}
182182
}
183183

@@ -195,7 +195,7 @@ func TestTemperatureSensorHalt_WithSensorCyclicRead(t *testing.T) {
195195
select {
196196
case <-done:
197197
case <-time.After(100 * time.Millisecond):
198-
t.Errorf("Temperature Sensor was not halted")
198+
require.Fail(t, "Temperature Sensor was not halted")
199199
}
200200
}
201201

‎drivers/aio/thermalzone_driver_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -84,7 +84,7 @@ func TestThermalZoneWithSensorCyclicRead_PublishesTemperatureInFahrenheit(t *tes
8484
select {
8585
case <-sem:
8686
case <-time.After(1 * time.Second):
87-
t.Errorf(" Temperature Sensor Event \"Data\" was not published")
87+
require.Fail(t, " Temperature Sensor Event \"Data\" was not published")
8888
}
8989

9090
assert.InDelta(t, -148.0, d.Value(), 0.0)

‎drivers/ble/microbit/accelerometer_driver_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,6 @@ func TestAccelerometerReadData(t *testing.T) {
6161
select {
6262
case <-sem:
6363
case <-time.After(100 * time.Millisecond):
64-
t.Errorf("Microbit Event \"Accelerometer\" was not published")
64+
require.Fail(t, "Microbit Event \"Accelerometer\" was not published")
6565
}
6666
}

‎drivers/ble/microbit/button_driver_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -56,6 +56,6 @@ func TestButtonReadData(t *testing.T) {
5656
select {
5757
case <-sem:
5858
case <-time.After(100 * time.Millisecond):
59-
t.Errorf("Microbit Event \"ButtonB\" was not published")
59+
require.Fail(t, "Microbit Event \"ButtonB\" was not published")
6060
}
6161
}

‎drivers/ble/microbit/magnetometer_driver_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -64,6 +64,6 @@ func TestMagnetometerReadData(t *testing.T) {
6464
select {
6565
case <-sem:
6666
case <-time.After(100 * time.Millisecond):
67-
t.Errorf("Microbit Event \"Magnetometer\" was not published")
67+
require.Fail(t, "Microbit Event \"Magnetometer\" was not published")
6868
}
6969
}

‎drivers/ble/microbit/temperature_driver_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -61,6 +61,6 @@ func TestTemperatureReadData(t *testing.T) {
6161
select {
6262
case <-sem:
6363
case <-time.After(100 * time.Millisecond):
64-
t.Errorf("Microbit Event \"Temperature\" was not published")
64+
require.Fail(t, "Microbit Event \"Temperature\" was not published")
6565
}
6666
}

‎drivers/common/spherocommon/spherocommon_test.go

+6-2
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,10 @@
11
package spherocommon
22

3-
import "testing"
3+
import (
4+
"testing"
5+
6+
"github.com/stretchr/testify/require"
7+
)
48

59
func TestCalculateChecksum(t *testing.T) {
610
tests := []struct {
@@ -14,7 +18,7 @@ func TestCalculateChecksum(t *testing.T) {
1418
for _, tt := range tests {
1519
actual := CalculateChecksum(tt.data)
1620
if actual != tt.checksum {
17-
t.Errorf("Expected %x, got %x for data %x.", tt.checksum, actual, tt.data)
21+
require.Fail(t, "Expected %x, got %x for data %x.", tt.checksum, actual, tt.data)
1822
}
1923
}
2024
}

‎drivers/gpio/grove_drivers_test.go

+2-2
Original file line numberDiff line numberDiff line change
@@ -71,7 +71,7 @@ func TestDigitalDriverHalt(t *testing.T) {
7171
time.Sleep(20 * time.Millisecond)
7272
// note: if a reading is already in progress, it will be finished before halt have an impact
7373
if atomic.LoadInt32(&callCount) > lastCallCount+1 {
74-
t.Errorf("DigitalRead was called more than once after driver was halted")
74+
require.Fail(t, "DigitalRead was called more than once after driver was halted")
7575
}
7676
}
7777
}
@@ -105,7 +105,7 @@ func TestDriverPublishesError(t *testing.T) {
105105
select {
106106
case <-sem:
107107
case <-time.After(time.Second):
108-
t.Errorf("%s Event \"Error\" was not published", getType(driver))
108+
require.Fail(t, "%s Event \"Error\" was not published", getType(driver))
109109
}
110110

111111
// Cleanup

‎drivers/gpio/pir_motion_driver_test.go

+4-4
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ func TestPIRMotionStart(t *testing.T) {
104104
select {
105105
case <-sem:
106106
case <-time.After(motionTestDelay * time.Millisecond):
107-
t.Errorf("PIRMotionDriver Event \"MotionDetected\" was not published")
107+
require.Fail(t, "PIRMotionDriver Event \"MotionDetected\" was not published")
108108
}
109109

110110
_ = d.Once(MotionStopped, func(data interface{}) {
@@ -116,7 +116,7 @@ func TestPIRMotionStart(t *testing.T) {
116116
select {
117117
case <-sem:
118118
case <-time.After(motionTestDelay * time.Millisecond):
119-
t.Errorf("PIRMotionDriver Event \"MotionStopped\" was not published")
119+
require.Fail(t, "PIRMotionDriver Event \"MotionStopped\" was not published")
120120
}
121121

122122
_ = d.Once(Error, func(data interface{}) {
@@ -126,7 +126,7 @@ func TestPIRMotionStart(t *testing.T) {
126126
select {
127127
case <-sem:
128128
case <-time.After(motionTestDelay * time.Millisecond):
129-
t.Errorf("PIRMotionDriver Event \"Error\" was not published")
129+
require.Fail(t, "PIRMotionDriver Event \"Error\" was not published")
130130
}
131131

132132
_ = d.Once(MotionDetected, func(data interface{}) {
@@ -138,7 +138,7 @@ func TestPIRMotionStart(t *testing.T) {
138138

139139
select {
140140
case <-sem:
141-
t.Errorf("PIRMotion Event \"MotionDetected\" should not published")
141+
require.Fail(t, "PIRMotion Event \"MotionDetected\" should not published")
142142
case <-time.After(motionTestDelay * time.Millisecond):
143143
}
144144
}

‎drivers/i2c/adafruit1109_driver_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func TestNewAdafruit1109Driver(t *testing.T) {
2323
var di interface{} = NewAdafruit1109Driver(newI2cTestAdaptor())
2424
d, ok := di.(*Adafruit1109Driver)
2525
if !ok {
26-
t.Errorf("NewAdafruit1109Driver() should have returned a *Adafruit1109Driver")
26+
require.Fail(t, "NewAdafruit1109Driver() should have returned a *Adafruit1109Driver")
2727
}
2828
assert.NotNil(t, d.Driver)
2929
assert.NotNil(t, d.Connection())

‎drivers/i2c/ads1x15_driver_1015_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func TestNewADS1015Driver(t *testing.T) {
2222
var di interface{} = NewADS1015Driver(newI2cTestAdaptor())
2323
d, ok := di.(*ADS1x15Driver)
2424
if !ok {
25-
t.Errorf("NewADS1015Driver() should have returned a *ADS1x15Driver")
25+
require.Fail(t, "NewADS1015Driver() should have returned a *ADS1x15Driver")
2626
}
2727
assert.NotNil(t, d.Driver)
2828
assert.True(t, strings.HasPrefix(d.Name(), "ADS1015"))

‎drivers/i2c/ads1x15_driver_1115_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ func TestNewADS1115Driver(t *testing.T) {
2222
var di interface{} = NewADS1115Driver(newI2cTestAdaptor())
2323
d, ok := di.(*ADS1x15Driver)
2424
if !ok {
25-
t.Errorf("NewADS1115Driver() should have returned a *ADS1x15Driver")
25+
require.Fail(t, "NewADS1115Driver() should have returned a *ADS1x15Driver")
2626
}
2727
assert.NotNil(t, d.Driver)
2828
assert.True(t, strings.HasPrefix(d.Name(), "ADS1115"))

‎drivers/i2c/adxl345_driver_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func TestNewADXL345Driver(t *testing.T) {
2525
var di interface{} = NewADXL345Driver(newI2cTestAdaptor())
2626
d, ok := di.(*ADXL345Driver)
2727
if !ok {
28-
t.Errorf("NewADXL345Driver() should have returned a *ADXL345Driver")
28+
require.Fail(t, "NewADXL345Driver() should have returned a *ADXL345Driver")
2929
}
3030
assert.NotNil(t, d.Driver)
3131
assert.True(t, strings.HasPrefix(d.Name(), "ADXL345"))

‎drivers/i2c/bh1750_driver_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func TestNewBH1750Driver(t *testing.T) {
2929
var di interface{} = NewBH1750Driver(newI2cTestAdaptor())
3030
d, ok := di.(*BH1750Driver)
3131
if !ok {
32-
t.Errorf("NewBH1750Driver() should have returned a *BH1750Driver")
32+
require.Fail(t, "NewBH1750Driver() should have returned a *BH1750Driver")
3333
}
3434
assert.NotNil(t, d.Driver)
3535
assert.True(t, strings.HasPrefix(d.Name(), "BH1750"))

‎drivers/i2c/blinkm_driver_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ func TestNewBlinkMDriver(t *testing.T) {
2929
var di interface{} = NewBlinkMDriver(newI2cTestAdaptor())
3030
d, ok := di.(*BlinkMDriver)
3131
if !ok {
32-
t.Errorf("NewBlinkMDriver() should have returned a *BlinkMDriver")
32+
require.Fail(t, "NewBlinkMDriver() should have returned a *BlinkMDriver")
3333
}
3434
assert.NotNil(t, d.Driver)
3535
assert.True(t, strings.HasPrefix(d.Name(), "BlinkM"))

‎drivers/i2c/bme280_driver_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func TestNewBME280Driver(t *testing.T) {
2525
var di interface{} = NewBME280Driver(newI2cTestAdaptor())
2626
d, ok := di.(*BME280Driver)
2727
if !ok {
28-
t.Errorf("NewBME280Driver() should have returned a *BME280Driver")
28+
require.Fail(t, "NewBME280Driver() should have returned a *BME280Driver")
2929
}
3030
assert.NotNil(t, d.Driver)
3131
assert.True(t, strings.HasPrefix(d.Name(), "BMP280"))

‎drivers/i2c/bmp180_driver_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func TestNewBMP180Driver(t *testing.T) {
2828
var di interface{} = NewBMP180Driver(newI2cTestAdaptor())
2929
d, ok := di.(*BMP180Driver)
3030
if !ok {
31-
t.Errorf("NewBMP180Driver() should have returned a *BMP180Driver")
31+
require.Fail(t, "NewBMP180Driver() should have returned a *BMP180Driver")
3232
}
3333
assert.NotNil(t, d.Driver)
3434
assert.True(t, strings.HasPrefix(d.Name(), "BMP180"))

‎drivers/i2c/bmp280_driver_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ func TestNewBMP280Driver(t *testing.T) {
2525
var di interface{} = NewBMP280Driver(newI2cTestAdaptor())
2626
d, ok := di.(*BMP280Driver)
2727
if !ok {
28-
t.Errorf("NewBMP280Driver() should have returned a *BMP280Driver")
28+
require.Fail(t, "NewBMP280Driver() should have returned a *BMP280Driver")
2929
}
3030
assert.NotNil(t, d.Driver)
3131
assert.True(t, strings.HasPrefix(d.Name(), "BMP280"))

‎drivers/i2c/bmp388_driver_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ func TestNewBMP388Driver(t *testing.T) {
4444
var di interface{} = NewBMP388Driver(newI2cTestAdaptor())
4545
d, ok := di.(*BMP388Driver)
4646
if !ok {
47-
t.Errorf("NewBMP388Driver() should have returned a *BMP388Driver")
47+
require.Fail(t, "NewBMP388Driver() should have returned a *BMP388Driver")
4848
}
4949
assert.NotNil(t, d.Driver)
5050
assert.True(t, strings.HasPrefix(d.Name(), "BMP388"))

‎drivers/i2c/ccs811_driver_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ func TestNewCCS811Driver(t *testing.T) {
2424
var di interface{} = NewCCS811Driver(newI2cTestAdaptor())
2525
d, ok := di.(*CCS811Driver)
2626
if !ok {
27-
t.Errorf("NewCCS811Driver() should have returned a *CCS811Driver")
27+
require.Fail(t, "NewCCS811Driver() should have returned a *CCS811Driver")
2828
}
2929
assert.NotNil(t, d.Driver)
3030
assert.True(t, strings.HasPrefix(d.Name(), "CCS811"))

‎drivers/i2c/drv2605l_driver_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ func TestNewDRV2605LDriver(t *testing.T) {
3737
var di interface{} = NewDRV2605LDriver(newI2cTestAdaptor())
3838
d, ok := di.(*DRV2605LDriver)
3939
if !ok {
40-
t.Errorf("NewDRV2605LDriver() should have returned a *DRV2605LDriver")
40+
require.Fail(t, "NewDRV2605LDriver() should have returned a *DRV2605LDriver")
4141
}
4242
assert.NotNil(t, d.Driver)
4343
assert.True(t, strings.HasPrefix(d.Name(), "DRV2605L"))

‎drivers/i2c/generic_driver_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"testing"
66

77
"github.com/stretchr/testify/assert"
8+
"github.com/stretchr/testify/require"
89

910
"gobot.io/x/gobot/v2"
1011
)
@@ -19,7 +20,7 @@ func TestNewGenericDriver(t *testing.T) {
1920
// assert
2021
d, ok := di.(*GenericDriver)
2122
if !ok {
22-
t.Errorf("NewGenericDriver() should have returned a *GenericDriver")
23+
require.Fail(t, "NewGenericDriver() should have returned a *GenericDriver")
2324
}
2425
assert.NotNil(t, d.Driver)
2526
assert.True(t, strings.HasPrefix(d.Name(), "GenericI2C"))

‎drivers/i2c/grovepi_driver_test.go

+3-3
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ func TestNewGrovePiDriver(t *testing.T) {
4242
var di interface{} = NewGrovePiDriver(newI2cTestAdaptor())
4343
d, ok := di.(*GrovePiDriver)
4444
if !ok {
45-
t.Errorf("NewGrovePiDriver() should have returned a *GrovePiDriver")
45+
require.Fail(t, "NewGrovePiDriver() should have returned a *GrovePiDriver")
4646
}
4747
assert.NotNil(t, d.Driver)
4848
assert.True(t, strings.HasPrefix(d.Name(), "GrovePi"))
@@ -165,7 +165,7 @@ func TestGrovePiSomeRead(t *testing.T) {
165165
case strings.Contains(name, "DHTRead"):
166166
gotF1, gotF2, err = g.DHTRead(strconv.Itoa(tc.usedPin), 1, 2)
167167
default:
168-
t.Errorf("unknown command %s", name)
168+
require.Fail(t, "unknown command %s", name)
169169
return
170170
}
171171
// assert
@@ -218,7 +218,7 @@ func TestGrovePiSomeWrite(t *testing.T) {
218218
case "AnalogWrite":
219219
err = g.AnalogWrite(strconv.Itoa(tc.usedPin), tc.usedValue)
220220
default:
221-
t.Errorf("unknown command %s", name)
221+
require.Fail(t, "unknown command %s", name)
222222
return
223223
}
224224
// assert

‎drivers/i2c/hmc5883l_driver_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ func TestNewHMC5883LDriver(t *testing.T) {
2323
var di interface{} = NewHMC5883LDriver(newI2cTestAdaptor())
2424
d, ok := di.(*HMC5883LDriver)
2525
if !ok {
26-
t.Errorf("NewHMC5883LDriver() should have returned a *HMC5883LDriver")
26+
require.Fail(t, "NewHMC5883LDriver() should have returned a *HMC5883LDriver")
2727
}
2828
assert.NotNil(t, d.Driver)
2929
assert.True(t, strings.HasPrefix(d.name, "HMC5883L"))

‎drivers/i2c/hmc6352_driver_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ func TestNewHMC6352Driver(t *testing.T) {
2828
var di interface{} = NewHMC6352Driver(newI2cTestAdaptor())
2929
d, ok := di.(*HMC6352Driver)
3030
if !ok {
31-
t.Errorf("NewHMC6352Driver() should have returned a *HMC6352Driver")
31+
require.Fail(t, "NewHMC6352Driver() should have returned a *HMC6352Driver")
3232
}
3333
assert.NotNil(t, d.Driver)
3434
assert.True(t, strings.HasPrefix(d.Name(), "HMC6352"))

‎drivers/i2c/i2c_config_test.go

+2-1
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ import (
55
"testing"
66

77
"github.com/stretchr/testify/assert"
8+
"github.com/stretchr/testify/require"
89
)
910

1011
func TestNewConfig(t *testing.T) {
@@ -13,7 +14,7 @@ func TestNewConfig(t *testing.T) {
1314
// assert
1415
c, ok := ci.(*i2cConfig)
1516
if !ok {
16-
t.Errorf("NewConfig() should have returned a *i2cConfig")
17+
require.Fail(t, "NewConfig() should have returned a *i2cConfig")
1718
}
1819
assert.Equal(t, BusNotInitialized, c.bus)
1920
assert.Equal(t, AddressNotInitialized, c.address)

‎drivers/i2c/i2c_driver_test.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ func TestNewDriver(t *testing.T) {
3030
// assert
3131
d, ok := di.(*Driver)
3232
if !ok {
33-
t.Errorf("NewDriver() should have returned a *Driver")
33+
require.Fail(t, "NewDriver() should have returned a *Driver")
3434
}
3535
assert.Contains(t, d.name, "I2C_BASIC")
3636
assert.Equal(t, 0x15, d.defaultAddress)

0 commit comments

Comments
 (0)