diff --git a/src/energenie/OpenThings_test.py b/src/energenie/OpenThings_test.py index 9ee20c4..6d8f6fb 100644 --- a/src/energenie/OpenThings_test.py +++ b/src/energenie/OpenThings_test.py @@ -137,20 +137,20 @@ # ACCESSOR VARIANTS # as method parameters: -# {pydict} +# 1 {pydict} # -# header={pydict} -# header_mfrid=123 -# -# recs_0={pydict} -# recs_0_paramid=PARAM_SWITCH_STATE -# recs_SWITCH_STATE={pydict} -# recs_SWITCH_STATE_value=1 +# 2 header={pydict} +# 3 header_mfrid=123 +# 4 recs_0={pydict} +# 5 recs_0_paramid=PARAM_SWITCH_STATE +# 6 SWITCH_STATE={pydict} +# 7 SWITCH_STATE,value=1 +# 8 SWITCH_STATE_value=1 # # as attribute accessors -# msg["header"] -# msg["recs"][0] -# msg[PARAM_SWITCH_STATE] +# 9 msg["header"] +# 10 msg["recs"][0] +# 11 msg[PARAM_SWITCH_STATE] class TestMessage(unittest.TestCase): @@ -160,104 +160,110 @@ msg = Message() msg.dump() - def test_blank_create_dict(self): + def test_blank_create_dict(self): #1 msg = Message({"header":{}, "recs":[{"parmid":PARAM_SWITCH_STATE, "value":1}]}) msg.dump() #### HEADER - def XXXtest_blank_create_header_dict(self): + def XXXtest_blank_create_header_dict(self): #2 # create a blank message and add a header at creation from a dict msg = Message(header={"mfrid":123, "productid":456, "sensorid":789}) msg.dump() - def XXXtest_blank_create_header_paths(self): + def XXXtest_blank_create_header_paths(self): #3 # create a blank message and add some header fields at creation time msg = Message(header_mfrid=123, header_productid=456, header_sensorid=789) msg.dump() - def XXXtest_add_header_attr(self): + def XXXtest_add_header_attr(self): #9 # add header fields to a message after creation like a pydict msg = Message() msg["header"]["mfrid"] = 123 msg.dump() - def XXXtest_add_header_path(self): + def XXXtest_add_header_path(self): #3 # add header fields to a message after creation via pathed keys msg = Message() msg.add(header_mfrid=123, header_productid=456) msg.dump() - def XXXtest_add_header_dict(self): + def XXXtest_add_header_dict(self): #2 msg = Message() msg.add(header={"mfrid":123, "productid":456, "sensorid":789}) msg.dump() #### RECORDS - def XXXtest_add_rec_attr(self): + def XXXtest_add_rec_attr(self): #9 # add rec fields to a message after creation like a pydict msg = Message() msg["recs"][0] = {"paramid": PARAM_SWITCH_STATE, "value": 1} msg.dump() - def XXXtest_add_rec_path(self): + def XXXtest_add_rec_path(self): #5 # add rec fields to a message after creation via pathed indexed keys msg = Message() msg.add(recs_0_paramid=PARAM_SWITCH_STATE, recs_0_value=1) msg.dump() - def XXXtest_add_rec_fn(self): + def XXXtest_add_rec_fn_pydict(self): #6 + # add rec fields to a message after creation via pathed PARAM name keys + msg = Message() + msg.add_rec(PARAM_SWITCH_STATE, {"value":1}) + msg.dump() + + def XXXtest_add_rec_fn(self): #7 # add rec fields to a message after creation via pathed PARAM name keys msg = Message() msg.add_rec(PARAM_SWITCH_STATE, value=1) msg.dump() - def XXXtest_add_rec_dict(self): + def XXXtest_add_rec_dict(self): #1 # add rec fields from a dict parameter msg = Message() msg.add_rec({"paramid":PARAM_SWITCH_STATE, "value":1}) - def XXXtest_create_template(self): + def XXXtest_create_template(self): #1 # create a message from a template msg = Message(Devices.MIHO005_REPORT) msg.dump() - def XXXtest_alter_rec_template(self): + def XXXtest_alter_rec_template(self): #3 # alter rec fields in a template msg = Message(Devices.MIHO005_REPORT) msg.alter(header_productid=123) msg.dump() - def XXXtest_alter_rec_template_paramname(self): + def XXXtest_alter_rec_template_paramname(self): #8 # alter rec fields in a template msg = Message(Devices.MIHO005_REPORT) msg.alter(recs_SWITCH_STATE_value=1) msg.dump() - def XXXtest_pydict_read(self): + def XXXtest_pydict_read(self): #9 ## access a specific keyed entry like a normal pydict, for read msg = Message(Devices.MIHO005_REPORT) print(msg["header"]) print(msg["header"]["mfrid"]) - def XXXtest_pydict_write(self): + def XXXtest_pydict_write(self): #9 ## access a specific keyed entry like a normal pydict, for write msg = Message(Devices.MIHO005_REPORT) msg["header"]["mfrid"] = 222 msg.dump() - def XXXtest_paramid_read_struct(self): + def XXXtest_paramid_read_struct(self): #11 # access a paramid entry for read of the whole structure msg = Message(Devices.MIHO005_REPORT) print(msg[PARAM_SWITCH_STATE]) - def XXXtest_paramid_read_field(self): + def XXXtest_paramid_read_field(self): #11 ## read a value from a param id field that exists msg = Message(Devices.MIHO005_REPORT) print(msg[PARAM_SWITCH_STATE]["value"]) - def XXXtest_paramid_write(self): + def XXXtest_paramid_write(self): #11 ## write a value to a param id field that exists msg = Message(Devices.MIHO005_REPORT) msg[PARAM_SWITCH_STATE]["value"] = 1