summaryrefslogtreecommitdiffstats
path: root/lab_control/test/jds6600_test.py
diff options
context:
space:
mode:
authorEddy Pedroni <eddy@0xf7.com>2022-05-30 19:52:31 +0200
committerEddy Pedroni <eddy@0xf7.com>2022-05-30 19:55:31 +0200
commit3e6f35592ae6a8b2f242c28e5f20ec7dc079ad87 (patch)
tree9a9adc05b8c3eb02a43200ca6b5ead09c3db7f0d /lab_control/test/jds6600_test.py
parent2972db9ee49ae0c20351afd64c04b5cfac9fca72 (diff)
Added function setter to JDS6600
Diffstat (limited to 'lab_control/test/jds6600_test.py')
-rw-r--r--lab_control/test/jds6600_test.py21
1 files changed, 14 insertions, 7 deletions
diff --git a/lab_control/test/jds6600_test.py b/lab_control/test/jds6600_test.py
index 07c77b4..c88114e 100644
--- a/lab_control/test/jds6600_test.py
+++ b/lab_control/test/jds6600_test.py
@@ -17,13 +17,13 @@ def uut(mockDevice):
yield uut
uut.closePort()
-def checkFloatParameter(testValues, writeValue, valueInMock, expectValid=True):
+def checkNumericalParameter(testValues, writeValue, valueInMock, expectValid=True):
for ch in AVAILABLE_CHANNELS:
- assert valueInMock(ch) == 0.0
+ assert valueInMock(ch) == None
for value in testValues:
writeValue(ch, value)
- expectedValue = value if expectValid else 0.0
+ expectedValue = value if expectValid else None
assert valueInMock(ch) == expectedValue
def test_serialConfiguration(mockDevice):
@@ -42,13 +42,20 @@ def test_channelOnAndOff(uut, mockDevice):
assert not mockDevice.isOn(ch)
def disabled_test_setFrequency(uut, mockDevice):
- checkFloatParameter([100.0, 100000.0, 0.0], uut.setFrequency, mockDevice.getFrequency)
+ checkNumericalParameter([100.0, 100000.0, 0.0], uut.setFrequency, mockDevice.getFrequency)
def test_setInvalidFrequency(uut, mockDevice):
- checkFloatParameter([None, -10.0, 60000000.1], uut.setFrequency, mockDevice.getFrequency, expectValid=False)
+ checkNumericalParameter([None, -10.0, 60000000.1], uut.setFrequency, mockDevice.getFrequency, expectValid=False)
def test_setAmplitude(uut, mockDevice):
- checkFloatParameter([0.1, 1.0, 10.0, 20.0, 0.0], uut.setAmplitude, mockDevice.getAmplitude)
+ checkNumericalParameter([0.1, 1.0, 10.0, 20.0, 0.0], uut.setAmplitude, mockDevice.getAmplitude)
def test_setInvalidAmplitude(uut, mockDevice):
- checkFloatParameter([None, -0.1, -10.0, 20.1], uut.setAmplitude, mockDevice.getAmplitude, expectValid=False)
+ checkNumericalParameter([None, -0.1, -10.0, 20.1], uut.setAmplitude, mockDevice.getAmplitude, expectValid=False)
+
+def test_setFunction(uut, mockDevice):
+ checkNumericalParameter(range(0, 17), uut.setFunction, mockDevice.getFunction)
+
+def test_setInvalidFunction(uut, mockDevice):
+ checkNumericalParameter([-1, -10, 17, 20, None], uut.setFunction, mockDevice.getFunction, expectValid=False)
+