Skip to content

Added read_write_int method and unit test for them #275

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
merged 9 commits into from
Sep 17, 2017
Merged

Added read_write_int method and unit test for them #275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
08acf4d
Updated attribute.py with new integer attribute
injaleea Sep 8, 2017
6874ebf
Updated session.py with rad_write_integer method
injaleea Sep 8, 2017
729e7b4
Adding unit test for get/set int32 attribute and error on close
injaleea Sep 8, 2017
f295b6c
updated close with error test
injaleea Sep 8, 2017
e7bc1b9
Fixed review comments
injaleea Sep 12, 2017
1e3c82a
fixed review comments .Removed close_error test to submit in another …
injaleea Sep 15, 2017
d7a9795
Merge branch 'master' into injaleea-dev-2
injaleea Sep 15, 2017
b5b2740
Removed white space
injaleea Sep 15, 2017
67b081c
Merge branch 'master' into injaleea-dev-2
injaleea Sep 16, 2017
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
4 changes: 4 additions & 0 deletions generated/nifake/session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -44,6 +44,10 @@ class Session(object):
'''
An attribute of type string with read/write access.
'''
read_write_integer = AttributeViInt32(1000004)
'''
An attribute of type integer with read/write access.
'''

def __init__(self, resource_name, id_query=False, reset_device=False, options_string=""):
self.library = library_singleton.get()
Expand Down
17 changes: 17 additions & 0 deletions generated/nifake/tests/test_session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,23 @@ def test_init_with_options_nondefault(self):
assert(session.vi == SESSION_NUM_FOR_TEST)
self.patched_library.niFake_InitWithOptions.assert_called_once_with(b'FakeDevice', True, True, b'Some string', ANY)

def test_get_vi_int32_attribute(self):
self.patched_library.niFake_GetAttributeViInt32.side_effect = self.side_effects_helper.niFake_GetAttributeViInt32
test_number = 3
self.side_effects_helper['GetAttributeViInt32']['attributeValue'] = test_number
with nifake.Session('dev1') as session:
attr_int = session.read_write_integer
assert(attr_int == test_number)
self.patched_library.niFake_GetAttributeViInt32.assert_called_once_with(SESSION_NUM_FOR_TEST, b'', 1000004, ANY)

def test_set_vi_int32_attribute(self):
self.patched_library.niFake_SetAttributeViInt32.side_effect = self.side_effects_helper.niFake_SetAttributeViInt32
attribute_id = 1000004
test_number = 1
with nifake.Session('dev1') as session:
session.read_write_integer = test_number
self.patched_library.niFake_SetAttributeViInt32.assert_called_once_with(SESSION_NUM_FOR_TEST, b'', attribute_id, test_number)

def test_read(self):
test_maximum_time = 10
test_reading = 5
Expand Down
12 changes: 12 additions & 0 deletions src/nifake/metadata/attributes.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,16 @@
'description':'An attribute of type Color with read/write access.',
},
},
1000004: {
'access': 'read-write',
'channel_based': 'False',
'enum': None,
'lv_property': 'Fake attributes:Read Write Int',
'name': 'READ_WRITE_INTEGER',
'resettable': 'No',
'type': 'ViInt32',
'documentation': {
'description':'An attribute of type integer with read/write access.',
},
},
}
17 changes: 17 additions & 0 deletions src/nifake/tests/test_session.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,6 +400,23 @@ def test_init_with_options_nondefault(self):
assert(session.vi == SESSION_NUM_FOR_TEST)
self.patched_library.niFake_InitWithOptions.assert_called_once_with(b'FakeDevice', True, True, b'Some string', ANY)

def test_get_vi_int32_attribute(self):
self.patched_library.niFake_GetAttributeViInt32.side_effect = self.side_effects_helper.niFake_GetAttributeViInt32
test_number = 3
self.side_effects_helper['GetAttributeViInt32']['attributeValue'] = test_number
with nifake.Session('dev1') as session:
attr_int = session.read_write_integer
assert(attr_int == test_number)
self.patched_library.niFake_GetAttributeViInt32.assert_called_once_with(SESSION_NUM_FOR_TEST, b'', 1000004, ANY)

def test_set_vi_int32_attribute(self):
self.patched_library.niFake_SetAttributeViInt32.side_effect = self.side_effects_helper.niFake_SetAttributeViInt32
attribute_id = 1000004
test_number = 1
with nifake.Session('dev1') as session:
session.read_write_integer = test_number
self.patched_library.niFake_SetAttributeViInt32.assert_called_once_with(SESSION_NUM_FOR_TEST, b'', attribute_id, 1)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How come you didn't use test_number here?


def test_read(self):
test_maximum_time = 10
test_reading = 5
Expand Down