[python-xbee] 2 new revisions pushed by pmalms...@gmail.com on 2013-06-01 21:17 GMT

[pytho...@googlecode.com]

2 new revisions:

Revision: 7155e3b5f2ce
Branch: default
Author: Paul Malmsten <pmal...@gmail.com>
Date: Sat Jun 1 14:01:32 2013
Log: Added test for calling xbee.tx() where data includes '}'
http://code.google.com/p/python-xbee/source/detail?r=7155e3b5f2ce

Revision: 7100bb027a3a
Branch: default
Author: Paul Malmsten <pmal...@gmail.com>
Date: Sat Jun 1 14:17:14 2013
Log: Added unit tests for an rx frame of a data string containing
simple JS...
http://code.google.com/p/python-xbee/source/detail?r=7100bb027a3a

==============================================================================
Revision: 7155e3b5f2ce
Branch: default
Author: Paul Malmsten <pmal...@gmail.com>
Date: Sat Jun 1 14:01:32 2013
Log: Added test for calling xbee.tx() where data includes '}'
http://code.google.com/p/python-xbee/source/detail?r=7155e3b5f2ce

Modified:
/xbee/tests/test_ieee.py

=======================================
--- /xbee/tests/test_ieee.py Sun Apr 14 09:34:14 2013
+++ /xbee/tests/test_ieee.py Sat Jun 1 14:01:32 2013
@@ -512,6 +512,15 @@
expected_data = b'\x7E\x00\x06\x08AMY\x00\x00\x10'
self.assertEqual(self.ser.data, expected_data)

+ def test_send_tx_with_close_brace(self):
+ """
+ Calling tx where the given data string includes a close brace '}'
+ must write correctly.
+ """
+ self.xbee.tx(dest_addr=b'\x01\x02',data=b'{test=1}')
+ expected_data = b'\x7E\x00\x0D\x01\x00\x01\x02\x00{test=1}\xD5'
+ self.assertEqual(self.ser.data, expected_data)
+
def test_shorthand_disabled(self):
"""
When shorthand is disabled, any attempt at calling a

==============================================================================
Revision: 7100bb027a3a
Branch: default
Author: Paul Malmsten <pmal...@gmail.com>
Date: Sat Jun 1 14:17:14 2013
Log: Added unit tests for an rx frame of a data string containing
simple JSON
http://code.google.com/p/python-xbee/source/detail?r=7100bb027a3a

Modified:
/xbee/tests/test_ieee.py

=======================================
--- /xbee/tests/test_ieee.py Sat Jun 1 14:01:32 2013
+++ /xbee/tests/test_ieee.py Sat Jun 1 14:17:14 2013
@@ -739,6 +739,38 @@
'command':b'MY',
'status':b'\x01'}
self.assertEqual(info, expected_info)
+
+ def test_read_rx_with_close_brace(self):
+ """
+ An rx data frame including a close brace must be read properly.
+ """
+ device =
FakeReadDevice(APIFrame(b'\x81\x01\x02\x55\x00{test=1}').output())
+ xbee = XBee(device)
+
+ info = xbee.wait_read_frame()
+ expected_info = {'id':'rx',
+ 'source_addr':b'\x01\x02',
+ 'rssi':b'\x55',
+ 'options':b'\x00',
+ 'rf_data':b'{test=1}'}
+ self.assertEqual(info, expected_info)
+
+ def test_read_rx_with_close_brace_escaped(self):
+ """
+ An escaped rx data frame including a close brace must be read
properly.
+ """
+ device = FakeReadDevice(
+ APIFrame(b'\x81\x01\x02\x55\x00{test=1}',
escaped=True).output()
+ )
+ xbee = XBee(device, escaped=True)
+
+ info = xbee.wait_read_frame()
+ expected_info = {'id':'rx',
+ 'source_addr':b'\x01\x02',
+ 'rssi':b'\x55',
+ 'options':b'\x00',
+ 'rf_data':b'{test=1}'}
+ self.assertEqual(info, expected_info)

if __name__ == '__main__':
unittest.main()