Merge branch 'artnim-batchresult'

Astn · Astn · commit 3aa155d221d9 · 2015-02-11T22:40:16.000-07:00
diff --git a/AustinHarris.JsonRpcTest/UnitTest1.cs b/AustinHarris.JsonRpcTest/UnitTest1.cs
@@ -1,4 +1,7 @@
 using System;
+using System.Security.Cryptography.X509Certificates;
+using System.Text.RegularExpressions;
+using System.Threading.Tasks;
 using AustinHarris.JsonRpc;
 using Microsoft.VisualStudio.TestTools.UnitTesting;
 
@@ -1335,15 +1338,37 @@ public void TestOptionalParametersBoolsAndStrings()
         }
 
         [TestMethod]
-        public void TestBatchResult()
+        public void TestBatchResultWrongRequests()
+        {
+            string request = @"[{},{""jsonrpc"":""2.0"",""id"":4}]";
+
+            var result = JsonRpcProcessor.Process(request);
+            result.Wait();
+
+            Assert.IsTrue(Regex.IsMatch(result.Result, @"\[(\{.*""error"":.*?,""id"":.*?\}),(\{.*""error"":.*?,""id"":.*?\})\]"), "Should have two errors.");
+        }
+
+        [TestMethod]
+        public void TestBatchResultMultipleMethodCallsNotificationAtLast()
         {
             string request =
-                @"[{},{""jsonrpc"":""2.0"",""id"":4},{""jsonrpc"":""2.0"",""method"":""ReturnsDateTime"",""params"":{},""id"":1},{""jsonrpc"":""2.0"",""method"":""Notify"",""params"":[""Hello World!""]}]";
+                @"[{""jsonrpc"":""2.0"",""method"":""ReturnsDateTime"",""params"":{},""id"":1},{""jsonrpc"":""2.0"",""method"":""Notify"",""params"":[""Hello World!""]}]";
 
             var result = JsonRpcProcessor.Process(request);
             result.Wait();
 
             Assert.IsFalse(result.Result.EndsWith(@",]"), "result.Result.EndsWith(@',]')");
+
+        }
+
+        [TestMethod]
+        public void TestEmptyBatchResult()
+        {
+            var secondRequest = @"{""jsonrpc"":""2.0"",""method"":""Notify"",""params"":[""Hello World!""]}";
+            var result = JsonRpcProcessor.Process(secondRequest);
+            result.Wait();
+
+            Assert.IsTrue(string.IsNullOrEmpty(result.Result));
         }
 
         [TestMethod]
@@ -1357,5 +1382,26 @@ public void TestLeftOutParams()
 
             Assert.IsFalse(result.Result.Contains(@"error"":{""code"":-32602"), @"According to JSON-RPC 2.0 the ""params"" member MAY be omitted.");
         }
+
+        [TestMethod]
+        public void TestMultipleResults()
+        {
+            var result =
+                JsonRpcProcessor.Process(
+                    @"[{""jsonrpc"":""2.0"",""method"":""ReturnsDateTime"",""params"":{},""id"":1},{""jsonrpc"":""2.0"",""method"":""ReturnsDateTime"",""params"":{},""id"":1}]");
+            result.Wait();
+
+            Assert.IsTrue(result.Result.EndsWith("]"));
+        }
+
+        [TestMethod]
+        public void TestSingleResultBatch()
+        { 
+            var result =
+                JsonRpcProcessor.Process(@"[{""jsonrpc"":""2.0"",""method"":""ReturnsDateTime"",""params"":{},""id"":1}]");
+            result.Wait();
+            Assert.IsFalse(result.Result.EndsWith("]"));
+        }
     }
 }
+
diff --git a/Json-Rpc/JsonRpcProcessor.cs b/Json-Rpc/JsonRpcProcessor.cs
@@ -121,7 +121,7 @@ private static string ProcessInternal(string sessionId, string jsonRpc, object j
                     responses[idx++] = JsonConvert.SerializeObject(resp.Item2);
                 }
 
-                return responses.Length == 1 ? responses[0] : string.Format("[{0}]", string.Join(",", responses));
+                return responses.Length == 0 ? string.Empty : responses.Length == 1 ? responses[0] : string.Format("[{0}]", string.Join(",", responses));
             }
             catch (Exception ex)
             {

Original file line number	Diff line number	Diff line change
`@@ -121,7 +121,7 @@ private static string ProcessInternal(string sessionId, string jsonRpc, object j`
`121`	`121`	`responses[idx++] = JsonConvert.SerializeObject(resp.Item2);`
`122`	`122`	`}`
`123`	`123`
`124`		`- return responses.Length == 1 ? responses[0] : string.Format("[{0}]", string.Join(",", responses));`
	`124`	`+ return responses.Length == 0 ? string.Empty : responses.Length == 1 ? responses[0] : string.Format("[{0}]", string.Join(",", responses));`
`125`	`125`	`}`
`126`	`126`	`catch (Exception ex)`
`127`	`127`	`{`