Skip to content

Commit

Permalink
Changes test messages to be OrderedDict (take 2)
Browse files Browse the repository at this point in the history 
Also added extra test for superfluous params in message
  • Loading branch information
Bryan Robert Tester committed Apr 30, 2018
1 parent 1be74e7 commit 1ea649a
Showing 1 changed file with 60 additions and 66 deletions.
126 changes: 60 additions & 66 deletions tests/test_modules/test_web/test_system_websocket.py
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,16 +39,12 @@ def send_message(self, req, convert_json=True):
conn.close()

def test_server_and_simple_client(self):
self.server._loop.add_callback(self.send_message,
OrderedDict(
typeid="malcolm:core/Post:1.0",
id=0,
path=["hello", "greet"],
parameters=dict(
name="me"
)
))

msg = OrderedDict()
msg['typeid'] = "malcolm:core/Post:1.0"
msg['id'] = 0
msg['path'] = ("hello", "greet")
msg['parameters'] = dict(name="me")
self.server._loop.add_callback(self.send_message, msg)
resp = self.result.get(timeout=2)
assert resp == dict(
typeid="malcolm:core/Return:1.0",
Expand Down Expand Up @@ -83,15 +79,11 @@ def test_error_server_and_simple_client_badJSON(self):
raise Exception("Got bad python version info")

def test_error_server_and_simple_client_no_id(self):
self.server._loop.add_callback(self.send_message,
OrderedDict(
typeid="malcolm:core/Post:1.0",
path=["hello", "greet"],
parameters=dict(
name="me"
)
)
)
msg = OrderedDict()
msg['typeid'] = "malcolm:core/Post:1.0"
msg['path'] = ("hello", "greet")
msg['parameters'] = dict(name="me")
self.server._loop.add_callback(self.send_message, msg)
resp = self.result.get(timeout=2)
assert resp == dict(
typeid="malcolm:core/Error:1.0",
Expand All @@ -100,16 +92,12 @@ def test_error_server_and_simple_client_no_id(self):
)

def test_error_server_and_simple_client_bad_type(self):
self.server._loop.add_callback(self.send_message,
OrderedDict(
typeid="NotATypeID",
id=0,
path=["hello", "greet"],
parameters=dict(
name="me"
)
)
)
msg = OrderedDict()
msg['typeid'] = "NotATypeID"
msg['id'] = 0
msg['path'] = ("hello", "greet")
msg['parameters'] = dict(name="me")
self.server._loop.add_callback(self.send_message, msg)
resp = self.result.get(timeout=2)
assert resp == dict(
typeid="malcolm:core/Error:1.0",
Expand All @@ -118,23 +106,19 @@ def test_error_server_and_simple_client_bad_type(self):
)

def test_error_server_and_simple_client_no_type(self):
self.server._loop.add_callback(self.send_message,
OrderedDict(
id=0,
path=["hello", "greet"],
parameters=dict(
name="me"
)
)
)
msg = OrderedDict()
msg['id'] = 0
msg['path'] = ("hello", "greet")
msg['parameters'] = dict(name="me")
self.server._loop.add_callback(self.send_message, msg)
resp = self.result.get(timeout=2)

if version_info[0] == 2:
assert resp == dict(
typeid="malcolm:core/Error:1.0",
id=0,
message="FieldError: typeid field not present in dictionary " +
"( d.keys() = [u'path', u'id', u'parameters'] )"
"( d.keys() = [u'id', u'path', u'parameters'] )"
)
elif version_info[0] == 3:
assert resp == dict(
Expand All @@ -147,34 +131,26 @@ def test_error_server_and_simple_client_no_type(self):
raise Exception("Got bad python version info")

def test_error_server_and_simple_client_bad_path_controller(self):
self.server._loop.add_callback(self.send_message,
OrderedDict(
typeid="malcolm:core/Post:1.0",
id=0,
path=["goodbye", "insult"],
parameters=dict(
name="me"
)
)
)
msg = OrderedDict()
msg['typeid'] = "malcolm:core/Post:1.0"
msg['id'] = 0
msg['path'] = ("goodbye", "insult")
msg['parameters'] = dict(name="me")
self.server._loop.add_callback(self.send_message, msg)
resp = self.result.get(timeout=2)
assert resp == dict(
typeid="malcolm:core/Error:1.0",
id=0,
message="ValueError: No controller registered for mri 'goodbye'"
)

def test_error_server_and_simple_client_bad_path_attribute(self):
self.server._loop.add_callback(self.send_message,
OrderedDict(
typeid="malcolm:core/Get:1.0",
id=0,
path=["hello", "insult"],
parameters=dict(
name="me"
)
)
)
def test_error_server_and_simple_client_superfluous_params(self):
msg = OrderedDict()
msg['typeid'] = "malcolm:core/Get:1.0"
msg['id'] = 0
msg['path'] = ("hello", "meta")
msg['parameters'] = dict(name="me")
self.server._loop.add_callback(self.send_message, msg)
resp = self.result.get(timeout=2)
assert resp == dict(
typeid="malcolm:core/Error:1.0",
Expand All @@ -183,13 +159,31 @@ def test_error_server_and_simple_client_bad_path_attribute(self):
"__init__() got an unexpected keyword argument 'parameters'"
)

def test_error_server_and_simple_client_bad_path_attribute(self):
msg = OrderedDict()
msg['typeid'] = "malcolm:core/Get:1.0"
msg['id'] = 0
msg['path'] = ("hello", "meat")
self.server._loop.add_callback(self.send_message, msg)
resp = self.result.get(timeout=2)
if version_info[0] == 2:
assert resp == dict(
typeid="malcolm:core/Error:1.0",
id=0,
message="UnexpectedError: Object [u'hello'] of type 'malcolm:core/Block:1.0' has no attribute u'meat'"
)
elif version_info[0] == 3:
assert resp == dict(
typeid="malcolm:core/Error:1.0",
id=0,
message="UnexpectedError: Object ['hello'] of type 'malcolm:core/Block:1.0' has no attribute 'meat'"
)

def test_error_server_and_simple_client_no_path(self):
self.server._loop.add_callback(self.send_message,
OrderedDict(
typeid="malcolm:core/Post:1.0",
id=0
)
)
msg = OrderedDict()
msg['typeid'] = "malcolm:core/Post:1.0"
msg['id'] = 0
self.server._loop.add_callback(self.send_message, msg)
resp = self.result.get(timeout=2)
assert resp == dict(
typeid="malcolm:core/Error:1.0",
Expand Down

0 comments on commit 1ea649a

Please sign in to comment.