Correced notification object structure, JsonRpcRequest param attribute now not created if params is None (no in output json string), tests corrected

Author: r3code

pyjsonrpclite/jsonrpc.py

@@ -48,14 +48,16 @@ class JsonRpcRequest(JsonRpcMessage):
     '''JSON-RPC 2.0 Request object'''
     def __init__(self, id, method, params = None): 
         self.id = id
-        self.method = method
-        self.params = params
+        self.method = method 
+        if not params is None:
+            self.params = params
 
 
 class JsonRpcNotification(JsonRpcRequest):
     '''JSON-RPC 2.0 Notification object'''
     def __init__(self, method, params = None):
         JsonRpcRequest.__init__(self, None, method, params)
+        del self.id
 
 
 class JsonRpcSuccessResponse(JsonRpcMessage):

tests/test_jsonrpc.py

@@ -51,12 +51,30 @@ def testJsonRpcMessageErrorCorrect(self):
         actual = JsonRpcMessage.Error(1, JsonRpcError(-32001, 'Err MSG', [105, 106]))
         testutils.assertEqualObjects(expected, actual)
 
-    def testJsonRpcMessageAsJsonCorrect(self):
+    def testJsonRpcMessageAsJsonCorrect(self):    
+        # request
         expected = '{\n"id": 1,\n"method": "login",\n"params": [\n"user",\n"password"\n]\n}'
-
         msg = JsonRpcMessage.Request(1, 'login', ['user', 'password'])
         actual = JsonRpcMessage.AsJson(msg, indent=False, escape=True)
         self.assertEqual(expected, actual)
+        
+        # request, no params
+        expected = '{\n"id": 1,\n"method": "login"\n}'
+        msg = JsonRpcMessage.Request(1, 'login')
+        actual = JsonRpcMessage.AsJson(msg, indent=False, escape=True)
+        self.assertEqual(expected, actual)
+        
+        # notify
+        expected = '{\n"method": "alarm",\n"params": [\n"a",\n"b"\n]\n}'
+        msg = JsonRpcMessage.Notification('alarm', ['a', 'b'])
+        actual = JsonRpcMessage.AsJson(msg, indent=False, escape=True)
+        self.assertEqual(expected, actual)
+        
+        # notify, no params
+        expected = '{\n"method": "alarm"\n}'
+        msg = JsonRpcMessage.Notification('alarm')
+        actual = JsonRpcMessage.AsJson(msg, indent=False, escape=True)
+        self.assertEqual(expected, actual)
 
     def testJsonRpcRequestCorrect(self):    
         '''Checks object inheritance, structure, init'''
@@ -73,10 +91,9 @@ def testJsonRpcNotificationCorrect(self):
         '''Checks object inheritance, structure, init'''
         msg = JsonRpcNotification('ntfName', 'params')
         self.assertTrue(isinstance(msg, JsonRpcRequest))
-        self.assertTrue(hasattr(msg, 'id'))
+        self.assertFalse(hasattr(msg, 'id'))
         self.assertTrue(hasattr(msg, 'method'))
         self.assertTrue(hasattr(msg, 'params'))
-        self.assertEqual(None, msg.id)
         self.assertEqual('ntfName', msg.method)
         self.assertEqual('params', msg.params)