fix batch results removing superfluous commas.

Martin Daetz · Martin Daetz · commit eca13888df47 · 2015-01-30T09:15:35.000+01:00
refactor JsonRpcProcessor.cs in order to avoid duplicate code.
diff --git a/AustinHarris.JsonRpcTest/UnitTest1.cs b/AustinHarris.JsonRpcTest/UnitTest1.cs
@@ -1,8 +1,7 @@
-&#65279;using System;
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using AustinHarris.JsonRpc.Client;
-using AustinHarris.JsonRpc;
-
+&#65279;using System;
+using AustinHarris.JsonRpc;
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
 namespace UnitTests
 {
     [TestClass]
@@ -1321,6 +1320,7 @@ public void TestOptionalParametersStrings_BothExists()
             Assert.IsFalse(result.Result.Contains("error"));
             Assert.AreEqual(expectedResult, result.Result);
         }
+
         [TestMethod]
         public void TestOptionalParametersBoolsAndStrings()
         {
@@ -1333,5 +1333,17 @@ public void TestOptionalParametersBoolsAndStrings()
             Assert.IsFalse(result.Result.Contains("error"));
             Assert.AreEqual(expectedResult, result.Result);
         }
+
+        [TestMethod]
+        public void TestBatchResult()
+        {
+            string request =
+                @"[{},{""jsonrpc"":""2.0"",""id"":4},{""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(@',]')");
+        }
     }
 }
diff --git a/AustinHarris.JsonRpcTest/service.cs b/AustinHarris.JsonRpcTest/service.cs
@@ -1,6 +1,7 @@
 &#65279;using AustinHarris.JsonRpc;
 using System;
-using System.Collections.Generic;
+using System.Collections.Generic;
+using System.Diagnostics;
 using System.Linq;
 using System.Text;
 
@@ -298,5 +299,10 @@ public bool TestOptionalParametersBoolsAndStrings(string input1, bool input2 = t
             return input2;
         }
 
+        [JsonRpcMethod]
+        public void Notify(string message)
+        {
+            Trace.WriteLine(string.Format("Notified about: {0}", message));
+        }
     }
 }
diff --git a/Json-Rpc/JsonRpcProcessor.cs b/Json-Rpc/JsonRpcProcessor.cs

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,7 @@`
`1`	`1`	`using AustinHarris.JsonRpc;`
`2`	`2`	`using System;`
`3`		`-using System.Collections.Generic;`
	`3`	`+using System.Collections.Generic;`
	`4`	`+using System.Diagnostics;`
`4`	`5`	`using System.Linq;`
`5`	`6`	`using System.Text;`
`6`	`7`
`@@ -298,5 +299,10 @@ public bool TestOptionalParametersBoolsAndStrings(string input1, bool input2 = t`
`298`	`299`	`return input2;`
`299`	`300`	`}`
`300`	`301`
	`302`	`+ [JsonRpcMethod]`
	`303`	`+ public void Notify(string message)`
	`304`	`+ {`
	`305`	`+ Trace.WriteLine(string.Format("Notified about: {0}", message));`
	`306`	`+ }`
`301`	`307`	`}`
`302`	`308`	`}`