Skip to content

Commit

Permalink
test(all): substitude assert.Nil by assert.NoError if useful (#1016)
Browse files Browse the repository at this point in the history
  • Loading branch information
gen2thomas committed Oct 26, 2023
1 parent f9950e2 commit 002c75c
Show file tree
Hide file tree
Showing 135 changed files with 795 additions and 795 deletions.
10 changes: 5 additions & 5 deletions drivers/aio/analog_actuator_driver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,12 @@ func TestAnalogActuatorDriver(t *testing.T) {
assert.Equal(t, "47", d.Pin())

err := d.RawWrite(100)
assert.Nil(t, err)
assert.NoError(t, err)
assert.Equal(t, 1, len(a.written))
assert.Equal(t, 100, a.written[0])

err = d.Write(247.0)
assert.Nil(t, err)
assert.NoError(t, err)
assert.Equal(t, 2, len(a.written))
assert.Equal(t, 247, a.written[1])
assert.Equal(t, 247, d.RawValue())
Expand Down Expand Up @@ -76,7 +76,7 @@ func TestAnalogActuatorDriverLinearScaler(t *testing.T) {
// act
err := d.Write(tt.input)
// assert
assert.Nil(t, err)
assert.NoError(t, err)
assert.Equal(t, 1, len(a.written))
assert.Equal(t, tt.want, a.written[0])
})
Expand All @@ -85,12 +85,12 @@ func TestAnalogActuatorDriverLinearScaler(t *testing.T) {

func TestAnalogActuatorDriverStart(t *testing.T) {
d := NewAnalogActuatorDriver(newAioTestAdaptor(), "1")
assert.Nil(t, d.Start())
assert.NoError(t, d.Start())
}

func TestAnalogActuatorDriverHalt(t *testing.T) {
d := NewAnalogActuatorDriver(newAioTestAdaptor(), "1")
assert.Nil(t, d.Halt())
assert.NoError(t, d.Halt())
}

func TestAnalogActuatorDriverDefaultName(t *testing.T) {
Expand Down
8 changes: 4 additions & 4 deletions drivers/aio/analog_sensor_driver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func TestAnalogSensorDriver(t *testing.T) {
})
assert.Equal(t, 0.0, d.Value())
val, err := d.Read()
assert.Nil(t, err)
assert.NoError(t, err)
assert.Equal(t, 150.0, val)
assert.Equal(t, 150.0, d.Value())
assert.Equal(t, 150, d.RawValue())
Expand Down Expand Up @@ -84,7 +84,7 @@ func TestAnalogSensorDriverWithLinearScaler(t *testing.T) {
// act
got, err := d.Read()
// assert
assert.Nil(t, err)
assert.NoError(t, err)
assert.Equal(t, tt.want, got)
})
}
Expand Down Expand Up @@ -113,7 +113,7 @@ func TestAnalogSensorDriverStart(t *testing.T) {
return
})

assert.Nil(t, d.Start())
assert.NoError(t, d.Start())

select {
case <-sem:
Expand Down Expand Up @@ -169,7 +169,7 @@ func TestAnalogSensorDriverHalt(t *testing.T) {
<-d.halt
close(done)
}()
assert.Nil(t, d.Halt())
assert.NoError(t, d.Halt())
select {
case <-done:
case <-time.After(100 * time.Millisecond):
Expand Down
2 changes: 1 addition & 1 deletion drivers/aio/grove_drivers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -90,7 +90,7 @@ func TestDriverPublishesError(t *testing.T) {
}
testAdaptor.TestAdaptorAnalogRead(returnErr)

assert.Nil(t, driver.Start())
assert.NoError(t, driver.Start())

// expect error
_ = driver.Once(driver.Event(Error), func(data interface{}) {
Expand Down
4 changes: 2 additions & 2 deletions drivers/aio/grove_temperature_sensor_driver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ func TestGroveTemperatureSensorDriverScaling(t *testing.T) {
// act
got, err := d.Read()
// assert
assert.Nil(t, err)
assert.NoError(t, err)
assert.Equal(t, tt.want, got)
})
}
Expand All @@ -66,7 +66,7 @@ func TestGroveTempSensorPublishesTemperatureInCelsius(t *testing.T) {
assert.Equal(t, "31.62", fmt.Sprintf("%.2f", data.(float64)))
sem <- true
})
assert.Nil(t, d.Start())
assert.NoError(t, d.Start())

select {
case <-sem:
Expand Down
10 changes: 5 additions & 5 deletions drivers/aio/temperature_sensor_driver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@ func TestTemperatureSensorDriverNtcScaling(t *testing.T) {
// act
got, err := d.Read()
// assert
assert.Nil(t, err)
assert.NoError(t, err)
assert.Equal(t, tt.want, got)
})
}
Expand Down Expand Up @@ -83,7 +83,7 @@ func TestTemperatureSensorDriverLinearScaling(t *testing.T) {
// act
got, err := d.Read()
// assert
assert.Nil(t, err)
assert.NoError(t, err)
assert.Equal(t, tt.want, got)
})
}
Expand All @@ -104,7 +104,7 @@ func TestTempSensorPublishesTemperatureInCelsius(t *testing.T) {
assert.Equal(t, "31.62", fmt.Sprintf("%.2f", data.(float64)))
sem <- true
})
assert.Nil(t, d.Start())
assert.NoError(t, d.Start())

select {
case <-sem:
Expand All @@ -126,7 +126,7 @@ func TestTempSensorPublishesError(t *testing.T) {
return
})

assert.Nil(t, d.Start())
assert.NoError(t, d.Start())

// expect error
_ = d.Once(d.Event(Error), func(data interface{}) {
Expand All @@ -148,7 +148,7 @@ func TestTempSensorHalt(t *testing.T) {
<-d.halt
close(done)
}()
assert.Nil(t, d.Halt())
assert.NoError(t, d.Halt())
select {
case <-done:
case <-time.After(100 * time.Millisecond):
Expand Down
16 changes: 8 additions & 8 deletions drivers/common/mfrc522/mfrc522_pcd_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -63,7 +63,7 @@ func TestInitialize(t *testing.T) {
// act
err := d.Initialize(c)
// assert
assert.Nil(t, err)
assert.NoError(t, err)
assert.Equal(t, c, d.connection)
assert.Equal(t, wantSoftReset, c.written[:3])
assert.Equal(t, wantInit, c.written[3:21])
Expand All @@ -80,7 +80,7 @@ func Test_getVersion(t *testing.T) {
// act
got, err := d.getVersion()
// assert
assert.Nil(t, err)
assert.NoError(t, err)
assert.Equal(t, want, got)
assert.Equal(t, wantWritten, c.written)
}
Expand Down Expand Up @@ -120,7 +120,7 @@ func Test_switchAntenna(t *testing.T) {
// act
err := d.switchAntenna(tc.target)
// assert
assert.Nil(t, err)
assert.NoError(t, err)
assert.Equal(t, tc.wantWritten, c.written)
})
}
Expand All @@ -134,7 +134,7 @@ func Test_stopCrypto1(t *testing.T) {
// act
err := d.stopCrypto1()
// assert
assert.Nil(t, err)
assert.NoError(t, err)
assert.Equal(t, wantWritten, c.written)
}

Expand All @@ -158,7 +158,7 @@ func Test_communicateWithPICC(t *testing.T) {
// transceive, all 8 bits, no CRC
err := d.communicateWithPICC(0x0C, dataToFifo, backData, 0x00, false)
// assert
assert.Nil(t, err)
assert.NoError(t, err)
assert.Equal(t, writtenPrepare, c.written[:8])
assert.Equal(t, writtenWriteFifo, c.written[8:12])
assert.Equal(t, writtenTransceive, c.written[12:16])
Expand All @@ -181,7 +181,7 @@ func Test_calculateCRC(t *testing.T) {
// act
err := d.calculateCRC(dataToFifo, gotCrcBack)
// assert
assert.Nil(t, err)
assert.NoError(t, err)
assert.Equal(t, writtenPrepare, c.written[:6])
assert.Equal(t, writtenFifo, c.written[6:10])
assert.Equal(t, writtenCalc, c.written[10:15])
Expand All @@ -197,7 +197,7 @@ func Test_writeFifo(t *testing.T) {
// act
err := d.writeFifo(dataToFifo)
// assert
assert.Nil(t, err)
assert.NoError(t, err)
assert.Equal(t, wantWritten, c.written)
}

Expand All @@ -210,7 +210,7 @@ func Test_readFifo(t *testing.T) {
// act
_, err := d.readFifo(backData)
// assert
assert.Nil(t, err)
assert.NoError(t, err)
assert.Equal(t, wantWritten, c.written)
assert.Equal(t, c.simFifo, backData)
}
4 changes: 2 additions & 2 deletions drivers/gpio/aip1640_driver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -32,12 +32,12 @@ func TestAIP1640Driver(t *testing.T) {

func TestAIP1640DriverStart(t *testing.T) {
d := initTestAIP1640Driver()
assert.Nil(t, d.Start())
assert.NoError(t, d.Start())
}

func TestAIP1640DriverHalt(t *testing.T) {
d := initTestAIP1640Driver()
assert.Nil(t, d.Halt())
assert.NoError(t, d.Halt())
}

func TestAIP1640DriverDefaultName(t *testing.T) {
Expand Down
6 changes: 3 additions & 3 deletions drivers/gpio/button_driver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ func TestButtonDriverHalt(t *testing.T) {
go func() {
<-d.halt
}()
assert.Nil(t, d.Halt())
assert.NoError(t, d.Halt())
}

func TestButtonDriver(t *testing.T) {
Expand All @@ -49,7 +49,7 @@ func TestButtonDriverStart(t *testing.T) {
return
})

assert.Nil(t, d.Start())
assert.NoError(t, d.Start())

select {
case <-sem:
Expand Down Expand Up @@ -122,7 +122,7 @@ func TestButtonDriverDefaultState(t *testing.T) {
return
})

assert.Nil(t, d.Start())
assert.NoError(t, d.Start())

select {
case <-sem:
Expand Down
6 changes: 3 additions & 3 deletions drivers/gpio/buzzer_driver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -28,12 +28,12 @@ func TestBuzzerDriverSetName(t *testing.T) {

func TestBuzzerDriverStart(t *testing.T) {
d := initTestBuzzerDriver(newGpioTestAdaptor())
assert.Nil(t, d.Start())
assert.NoError(t, d.Start())
}

func TestBuzzerDriverHalt(t *testing.T) {
d := initTestBuzzerDriver(newGpioTestAdaptor())
assert.Nil(t, d.Halt())
assert.NoError(t, d.Halt())
}

func TestBuzzerDriverToggle(t *testing.T) {
Expand All @@ -47,7 +47,7 @@ func TestBuzzerDriverToggle(t *testing.T) {

func TestBuzzerDriverTone(t *testing.T) {
d := initTestBuzzerDriver(newGpioTestAdaptor())
assert.Nil(t, d.Tone(100, 0.01))
assert.NoError(t, d.Tone(100, 0.01))
}

func TestBuzzerDriverOnError(t *testing.T) {
Expand Down
16 changes: 8 additions & 8 deletions drivers/gpio/direct_pin_driver_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -54,12 +54,12 @@ func TestDirectPinDriver(t *testing.T) {

func TestDirectPinDriverStart(t *testing.T) {
d := initTestDirectPinDriver()
assert.Nil(t, d.Start())
assert.NoError(t, d.Start())
}

func TestDirectPinDriverHalt(t *testing.T) {
d := initTestDirectPinDriver()
assert.Nil(t, d.Halt())
assert.NoError(t, d.Halt())
}

func TestDirectPinDriverOff(t *testing.T) {
Expand All @@ -68,7 +68,7 @@ func TestDirectPinDriverOff(t *testing.T) {

a := newGpioTestAdaptor()
d = NewDirectPinDriver(a, "1")
assert.Nil(t, d.Off())
assert.NoError(t, d.Off())
}

func TestDirectPinDriverOffNotSupported(t *testing.T) {
Expand All @@ -80,7 +80,7 @@ func TestDirectPinDriverOffNotSupported(t *testing.T) {
func TestDirectPinDriverOn(t *testing.T) {
a := newGpioTestAdaptor()
d := NewDirectPinDriver(a, "1")
assert.Nil(t, d.On())
assert.NoError(t, d.On())
}

func TestDirectPinDriverOnError(t *testing.T) {
Expand All @@ -97,7 +97,7 @@ func TestDirectPinDriverOnNotSupported(t *testing.T) {
func TestDirectPinDriverDigitalWrite(t *testing.T) {
adaptor := newGpioTestAdaptor()
d := NewDirectPinDriver(adaptor, "1")
assert.Nil(t, d.DigitalWrite(1))
assert.NoError(t, d.DigitalWrite(1))
}

func TestDirectPinDriverDigitalWriteNotSupported(t *testing.T) {
Expand All @@ -115,7 +115,7 @@ func TestDirectPinDriverDigitalRead(t *testing.T) {
d := initTestDirectPinDriver()
ret, err := d.DigitalRead()
assert.Equal(t, 1, ret)
assert.Nil(t, err)
assert.NoError(t, err)
}

func TestDirectPinDriverDigitalReadNotSupported(t *testing.T) {
Expand All @@ -128,7 +128,7 @@ func TestDirectPinDriverDigitalReadNotSupported(t *testing.T) {
func TestDirectPinDriverPwmWrite(t *testing.T) {
a := newGpioTestAdaptor()
d := NewDirectPinDriver(a, "1")
assert.Nil(t, d.PwmWrite(1))
assert.NoError(t, d.PwmWrite(1))
}

func TestDirectPinDriverPwmWriteNotSupported(t *testing.T) {
Expand All @@ -145,7 +145,7 @@ func TestDirectPinDriverPwmWriteError(t *testing.T) {
func TestDirectPinDriverServoWrite(t *testing.T) {
a := newGpioTestAdaptor()
d := NewDirectPinDriver(a, "1")
assert.Nil(t, d.ServoWrite(1))
assert.NoError(t, d.ServoWrite(1))
}

func TestDirectPinDriverServoWriteNotSupported(t *testing.T) {
Expand Down
2 changes: 1 addition & 1 deletion drivers/gpio/grove_drivers_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -91,7 +91,7 @@ func TestDriverPublishesError(t *testing.T) {
}
testAdaptor.testAdaptorDigitalRead = returnErr

assert.Nil(t, driver.Start())
assert.NoError(t, driver.Start())

// expect error
_ = driver.Once(driver.Event(Error), func(data interface{}) {
Expand Down
Loading

0 comments on commit 002c75c

Please sign in to comment.