diff options
Diffstat (limited to 'lab_control/test/frequency_response_test.py')
| -rw-r--r-- | lab_control/test/frequency_response_test.py | 21 |
1 files changed, 16 insertions, 5 deletions
diff --git a/lab_control/test/frequency_response_test.py b/lab_control/test/frequency_response_test.py index 2997413..61fd021 100644 --- a/lab_control/test/frequency_response_test.py +++ b/lab_control/test/frequency_response_test.py @@ -3,6 +3,7 @@ import pytest from lab_control.test.mock_lab import MockLab from lab_control.frequency_response import FrequencyResponseMeasurement from lab_control.measurement import getLinearRange +from lab_control.function_generator import FunctionGenerator @pytest.fixture def mockLab(): @@ -14,7 +15,6 @@ def uut(mockLab): def prepareRampResponse(uut, mockLab): # Expect a ramp response from 0.5 to 1.5 * input amplitude - inputAmplitude = 2.0 minScale = 0.5 maxScale = 1.5 @@ -25,15 +25,14 @@ def prepareRampResponse(uut, mockLab): mockLab.connectChannels(uut.functionGeneratorChannel, uut.oscilloscopeChannel) mockLab.setTestFunction(uut.oscilloscopeChannel, testFunction) - mockLab.setAmplitude(uut.functionGeneratorChannel, inputAmplitude) - mockLab.setOn(uut.functionGeneratorChannel) - return [(f, testFunction(f) * inputAmplitude) for f in getLinearRange(uut.minFrequency, uut.maxFrequency, uut.steps)] + return [(f, testFunction(f) * uut.inputAmplitude) for f in getLinearRange(uut.minFrequency, uut.maxFrequency, uut.steps)] def test_frequencyResponseDefaults(uut): assert uut.minFrequency == 20e0 assert uut.maxFrequency == 16e3 assert uut.steps == 50 + assert uut.inputAmplitude == 0.1 assert uut.functionGeneratorChannel == 1 assert uut.oscilloscopeChannel == 1 @@ -43,14 +42,26 @@ def test_frequencyResponseRamp(uut, mockLab): uut.steps = 11 uut.functionGeneratorChannel = 1 uut.oscilloscopeChannel = 1 + uut.inputAmplitude = 2.0 + + fg = mockLab.getFunctionGeneratorChannel(uut.functionGeneratorChannel) + osc = mockLab.getOscilloscopeChannel(uut.oscilloscopeChannel) expectedData = prepareRampResponse(uut, mockLab) assert not uut.measurementDone - assert uut.data == None + assert uut.data is None + assert fg.amplitude is None + assert fg.function is None + assert not fg.on + assert osc.voltsPerDiv is None uut.measure(mockLab, mockLab) + assert fg.amplitude == uut.inputAmplitude + assert fg.function == FunctionGenerator.SINE + assert fg.on + assert osc.voltsPerDiv == uut.inputAmplitude / 6 assert uut.measurementDone assert uut.data == expectedData |