From 3dd379cdf12d885e26f8ec26c54879a95d5f0b84 Mon Sep 17 00:00:00 2001 From: Robin Gloster Date: Mon, 18 Aug 2014 15:15:14 +0200 Subject: Revert "cleanup semicolons, whitespace and mutable default arguments" This reverts commit 7265682a4d57d88956cb54f98f7a470465bbf417. --- tests/test_stanza_xep_0323.py | 135 +++++++++++++++++++++--------------------- 1 file changed, 69 insertions(+), 66 deletions(-) (limited to 'tests/test_stanza_xep_0323.py') diff --git a/tests/test_stanza_xep_0323.py b/tests/test_stanza_xep_0323.py index 7b1dfe42..67e0daf0 100644 --- a/tests/test_stanza_xep_0323.py +++ b/tests/test_stanza_xep_0323.py @@ -6,7 +6,7 @@ import sleekxmpp.plugins.xep_0323 as xep_0323 namespace='sn' class TestSensorDataStanzas(SleekTest): - + def setUp(self): pass @@ -59,8 +59,8 @@ class TestSensorDataStanzas(SleekTest): iq['req']['momentary'] = 'true' - iq['req'].add_node("Device02", "Source02", "CacheType") - iq['req'].add_node("Device44") + iq['req'].add_node("Device02", "Source02", "CacheType"); + iq['req'].add_node("Device44"); self.check(iq,""" @@ -193,7 +193,7 @@ class TestSensorDataStanzas(SleekTest): iq['rejected']['error'] = 'Access denied.' self.check(iq,""" - @@ -237,12 +237,12 @@ class TestSensorDataStanzas(SleekTest): msg['to'] = 'master@clayster.com/amr' msg['fields']['seqnr'] = '1' - node = msg['fields'].add_node("Device02") - ts = node.add_timestamp("2013-03-07T16:24:30") + node = msg['fields'].add_node("Device02"); + ts = node.add_timestamp("2013-03-07T16:24:30"); - data = ts.add_data(typename="numeric", name="Temperature", value="-12.42", unit='K') - data['momentary'] = 'true' - data['automaticReadout'] = 'true' + data = ts.add_data(typename="numeric", name="Temperature", value="-12.42", unit='K'); + data['momentary'] = 'true'; + data['automaticReadout'] = 'true'; self.check(msg,""" - + @@ -258,9 +258,10 @@ class TestSensorDataStanzas(SleekTest): """ ) - node = msg['fields'].add_node("EmptyDevice") - node = msg['fields'].add_node("Device04") - ts = node.add_timestamp("EmptyTimestamp") + node = msg['fields'].add_node("EmptyDevice"); + node = msg['fields'].add_node("Device04"); + ts = node.add_timestamp("EmptyTimestamp"); + self.check(msg,""" - + @@ -280,32 +281,32 @@ class TestSensorDataStanzas(SleekTest): """ ) - node = msg['fields'].add_node("Device77") - ts = node.add_timestamp("2013-05-03T12:00:01") - data = ts.add_data(typename="numeric", name="Temperature", value="-12.42", unit='K') - data['historicalDay'] = 'true' - data = ts.add_data(typename="numeric", name="Speed", value="312.42", unit='km/h') - data['historicalWeek'] = 'false' - data = ts.add_data(typename="string", name="Temperature name", value="Bottom oil") - data['historicalMonth'] = 'true' - data = ts.add_data(typename="string", name="Speed name", value="Top speed") - data['historicalQuarter'] = 'false' - data = ts.add_data(typename="dateTime", name="T1", value="1979-01-01T00:00:00") - data['historicalYear'] = 'true' - data = ts.add_data(typename="dateTime", name="T2", value="2000-01-01T01:02:03") - data['historicalOther'] = 'false' - data = ts.add_data(typename="timeSpan", name="TS1", value="P5Y") - data['missing'] = 'true' - data = ts.add_data(typename="timeSpan", name="TS2", value="PT2M1S") - data['manualEstimate'] = 'false' - data = ts.add_data(typename="enum", name="top color", value="red", dataType="string") - data['invoiced'] = 'true' - data = ts.add_data(typename="enum", name="bottom color", value="black", dataType="string") - data['powerFailure'] = 'false' - data = ts.add_data(typename="boolean", name="Temperature real", value="false") - data['historicalDay'] = 'true' - data = ts.add_data(typename="boolean", name="Speed real", value="true") - data['historicalWeek'] = 'false' + node = msg['fields'].add_node("Device77"); + ts = node.add_timestamp("2013-05-03T12:00:01"); + data = ts.add_data(typename="numeric", name="Temperature", value="-12.42", unit='K'); + data['historicalDay'] = 'true'; + data = ts.add_data(typename="numeric", name="Speed", value="312.42", unit='km/h'); + data['historicalWeek'] = 'false'; + data = ts.add_data(typename="string", name="Temperature name", value="Bottom oil"); + data['historicalMonth'] = 'true'; + data = ts.add_data(typename="string", name="Speed name", value="Top speed"); + data['historicalQuarter'] = 'false'; + data = ts.add_data(typename="dateTime", name="T1", value="1979-01-01T00:00:00"); + data['historicalYear'] = 'true'; + data = ts.add_data(typename="dateTime", name="T2", value="2000-01-01T01:02:03"); + data['historicalOther'] = 'false'; + data = ts.add_data(typename="timeSpan", name="TS1", value="P5Y"); + data['missing'] = 'true'; + data = ts.add_data(typename="timeSpan", name="TS2", value="PT2M1S"); + data['manualEstimate'] = 'false'; + data = ts.add_data(typename="enum", name="top color", value="red", dataType="string"); + data['invoiced'] = 'true'; + data = ts.add_data(typename="enum", name="bottom color", value="black", dataType="string"); + data['powerFailure'] = 'false'; + data = ts.add_data(typename="boolean", name="Temperature real", value="false"); + data['historicalDay'] = 'true'; + data = ts.add_data(typename="boolean", name="Speed real", value="true"); + data['historicalWeek'] = 'false'; self.check(msg,""" - + @@ -322,18 +323,18 @@ class TestSensorDataStanzas(SleekTest): - - - - - - - - - - - - + + + + + + + + + + + + @@ -341,19 +342,21 @@ class TestSensorDataStanzas(SleekTest): """ ) - + def testTimestamp(self): - msg = self.Message() + msg = self.Message(); msg['from'] = 'device@clayster.com' msg['to'] = 'master@clayster.com/amr' msg['fields']['seqnr'] = '1' - node = msg['fields'].add_node("Device02") - node = msg['fields'].add_node("Device03") + node = msg['fields'].add_node("Device02"); + node = msg['fields'].add_node("Device03"); + + ts = node.add_timestamp("2013-03-07T16:24:30"); + ts = node.add_timestamp("2013-03-07T16:24:31"); + - ts = node.add_timestamp("2013-03-07T16:24:30") - ts = node.add_timestamp("2013-03-07T16:24:31") self.check(msg,"""