Seeing if I can split the XMPP responsibilities from the vacuum responsibilities.

2017-12-11 16:14:52 -08:00
parent 8bcef91efb
commit fbd3c3d85a
5 changed files with 137 additions and 124 deletions
@@ -1,70 +1,18 @@
-from xml.etree import ElementTree
-
-from re import search
 from nose.tools import *

 from sucks import *


-# There are few tests for the XMPP stuff here because a) it's relatively complicated to test given
-# the library's design and its multithreaded nature, and b) I'm manually testing every change anyhow,
-# as it's not clear how the robot really behaves.
-
-def test_custom_command():
-    # Ensure a custom-built command generates the expected XML payload
-    c = VacBotCommand('CustomCommand', {'type': 'customtype'})
-    assert_equals(ElementTree.tostring(c.to_xml()),
-
-                  b'<ctl td="CustomCommand"><customcommand type="customtype" /></ctl>')
-
-def test_custom_command_noargs():
-    # Ensure a custom-built command with no args generates XML without an args element
-    c = VacBotCommand('CustomCommand')
-    assert_equals(ElementTree.tostring(c.to_xml()),
-                  b'<ctl td="CustomCommand" />')
-
-
-def test_clean_command():
-    c = Clean(10)
-    assert_equals(c.terminal, False)
-    assert_equals(c.wait, 10)
-    assert_equals(ElementTree.tostring(c.to_xml()),
-                  b'<ctl td="Clean"><clean speed="standard" type="auto" /></ctl>')  # protocol has attribs in other order
-
-
-def test_edge_command():
-    # called Edge because that's what the UI uses, even though the protocol is different
-    c = Edge(10)
-    assert_equals(c.terminal, False)
-    assert_equals(c.wait, 10)
-    assert_equals(ElementTree.tostring(c.to_xml()),
-                  b'<ctl td="Clean"><clean speed="strong" type="border" /></ctl>')  # protocol has attribs in other order
-
-
-def test_charge_command():
-    c = Charge()
-    assert_equals(c.terminal, True)
-    assert_equals(ElementTree.tostring(c.to_xml()),
-                  b'<ctl td="Charge"><charge type="go" /></ctl>')
-
-
-def test_stop_command():
-    c = Stop()
-    assert_equals(c.terminal, True)
-    assert_equals(ElementTree.tostring(c.to_xml()),
-                  b'<ctl td="Clean"><clean speed="standard" type="stop" /></ctl>')
-
-
-def test_wrap_command():
-    v = VacBot('20170101abcdefabcdefa', 'ecouser.net', 'abcdef12', 'A1b2C3d4efghijklmNOPQrstuvwxyz12',
-               {"did": "E0000000001234567890", "class": "126", "nick": "bob"}, 'na')
-    c = str(v.wrap_command(Clean(1).to_xml()))
-    assert_true(search(r'from="20170101abcdefabcdefa@ecouser.net/abcdef12"', c))
-    assert_true(search(r'to="E0000000001234567890@126.ecorobot.net/atom"', c))
+def test_bot_address():
+    v = vacbot_for_bot({"did": "E0000000001234567890", "class": "126", "nick": "bob"})
+    assert_equals('E0000000001234567890@126.ecorobot.net/atom', v._vacuum_adress())


 def test_model_variation():
-    v = VacBot('20170101abcdefabcdefa', 'ecouser.net', 'abcdef12', 'A1b2C3d4efghijklmNOPQrstuvwxyz12',
-               {"did": "E0000000001234567890", "class": "141", "nick": "bob"}, 'na')
-    c = str(v.wrap_command(Clean(1).to_xml()))
-    assert_true(search(r'to="E0000000001234567890@141.ecorobot.net/atom"', c))
+    v = vacbot_for_bot({"did": "E0000000001234567890", "class": "141", "nick": "bob"})
+    assert_equals('E0000000001234567890@141.ecorobot.net/atom', v._vacuum_adress())
+
+
+def vacbot_for_bot(bot):
+    return VacBot('20170101abcdefabcdefa', 'ecouser.net', 'abcdef12', 'A1b2C3d4efghijklmNOPQrstuvwxyz12',
+                  bot, 'na')