Skip to content

Fix set_value not performing unit conversion. #77

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
willrogers merged 4 commits into from
Aug 21, 2018
Merged

Fix set_value not performing unit conversion. #77

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
b7d1254
Fix set_value not performing unit conversion.
T-Nicholls Aug 21, 2018
fb25466
Update tests to reflect fix to set_value.
T-Nicholls Aug 21, 2018
244ed6f
Fix 'missing whitespace around arithmetic operator' error.
T-Nicholls Aug 21, 2018
42210bb
Remove models print statement and ammend name of sim unit conversion …
T-Nicholls Aug 21, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pytac/element.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -192,7 +192,7 @@ def set_value(self, field, value, handle=pytac.SP, units=pytac.ENG,
raise DeviceException('Must write using {}'.format(pytac.SP))
try:
model = self._models[model]
self._uc[field].convert(value, origin=units, target=model.units)
value = self._uc[field].convert(value, origin=units, target=model.units)
model.set_value(field, value)
except KeyError:
raise DeviceException('No model type {} on element {}'.format(model,
Expand Down
43 changes: 12 additions & 31 deletions test/test_element.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,16 +12,11 @@
DUMMY_VALUE_2 = 4.7
DUMMY_VALUE_3 = -6


def mock_uc():
uc = mock.MagicMock()
uc.phys_to_eng.return_value = DUMMY_VALUE_2
uc.eng_to_phys.return_value = DUMMY_VALUE_3
return uc
mock_uc = PolyUnitConv([2, 0])


@pytest.fixture
def test_element(uc=mock_uc()):
def test_element(uc=mock_uc):
mock_cs = mock.MagicMock()
mock_cs.get.return_value = DUMMY_VALUE_1

Expand Down Expand Up @@ -80,17 +75,14 @@ def test_get_value_uses_cs_if_model_live(test_element):


def test_get_value_uses_uc_if_necessary_for_cs_call(test_element):
test_element.get_value('x', handle=pytac.SP, units=pytac.PHYS, model=pytac.LIVE)
test_element._uc['x'].convert.assert_called_with(DUMMY_VALUE_1,
origin=pytac.ENG, target=pytac.PHYS)
assert test_element.get_value('x', handle=pytac.SP, units=pytac.PHYS,
model=pytac.LIVE) == (DUMMY_VALUE_1 * 2)
test_element.get_device('x')._cs.get.assert_called_with(SP_PV)


def test_get_value_uses_uc_if_necessary_for_model_call(test_element):
print(test_element._models)
test_element.get_value('x', handle=pytac.SP, units=pytac.ENG, model=pytac.SIM)
test_element._uc['x'].convert.assert_called_with(DUMMY_VALUE_2,
origin=pytac.PHYS, target=pytac.ENG)
def test_get_value_uses_uc_if_necessary_for_sim_call(test_element):
assert test_element.get_value('x', handle=pytac.SP, units=pytac.ENG,
model=pytac.SIM) == (DUMMY_VALUE_2 / 2)
test_element._models[pytac.SIM].get_value.assert_called_with('x', pytac.SP)


Expand All @@ -102,27 +94,16 @@ def test_get_pv_name(pv_type, test_element):

def test_set_value_eng(test_element):
test_element.set_value('x', DUMMY_VALUE_2)
test_element.get_device('x')._cs.put.assert_called_with(
SP_PV,
DUMMY_VALUE_2
)
# No conversion needed
test_element._uc['x'].convert.assert_called_with(
DUMMY_VALUE_2,
origin=pytac.ENG,
target=pytac.ENG
)
test_element.get_device('x')._cs.put.assert_called_with(SP_PV,
DUMMY_VALUE_2)


def test_set_value_phys(test_element):
test_element.set_value('x', DUMMY_VALUE_2, units=pytac.PHYS)
# Conversion to physics units
test_element._uc['x'].convert.assert_called_with(
DUMMY_VALUE_2,
origin=pytac.PHYS,
target=pytac.ENG
)
test_element.get_device('x')._cs.put.assert_called_with(SP_PV, DUMMY_VALUE_2)
# Conversion fron physics to engineering units
test_element.get_device('x')._cs.put.assert_called_with(SP_PV,
(DUMMY_VALUE_2 / 2))


def test_set_value_incorrect_field(test_element):
Expand Down