From 6b6c40b153890ef54ec0c9aa4976e604b14e89cb Mon Sep 17 00:00:00 2001 From: Eddy Pedroni Date: Mon, 30 May 2022 19:56:51 +0200 Subject: Improved JDS6600 tests --- lab_control/test/jds6600_test.py | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/lab_control/test/jds6600_test.py b/lab_control/test/jds6600_test.py index c88114e..256a5d0 100644 --- a/lab_control/test/jds6600_test.py +++ b/lab_control/test/jds6600_test.py @@ -42,16 +42,16 @@ def test_channelOnAndOff(uut, mockDevice): assert not mockDevice.isOn(ch) def disabled_test_setFrequency(uut, mockDevice): - checkNumericalParameter([100.0, 100000.0, 0.0], uut.setFrequency, mockDevice.getFrequency) + checkNumericalParameter([0.0, 100.0, 100000.0], uut.setFrequency, mockDevice.getFrequency) def test_setInvalidFrequency(uut, mockDevice): - checkNumericalParameter([None, -10.0, 60000000.1], uut.setFrequency, mockDevice.getFrequency, expectValid=False) + checkNumericalParameter([-10.0, 60000000.1, None], uut.setFrequency, mockDevice.getFrequency, expectValid=False) def test_setAmplitude(uut, mockDevice): - checkNumericalParameter([0.1, 1.0, 10.0, 20.0, 0.0], uut.setAmplitude, mockDevice.getAmplitude) + checkNumericalParameter([0.0, 0.1, 1.0, 10.0, 20.0], uut.setAmplitude, mockDevice.getAmplitude) def test_setInvalidAmplitude(uut, mockDevice): - checkNumericalParameter([None, -0.1, -10.0, 20.1], uut.setAmplitude, mockDevice.getAmplitude, expectValid=False) + checkNumericalParameter([-0.1, -10.0, 20.1, None], uut.setAmplitude, mockDevice.getAmplitude, expectValid=False) def test_setFunction(uut, mockDevice): checkNumericalParameter(range(0, 17), uut.setFunction, mockDevice.getFunction) -- cgit v1.2.3