More tests for dispatcher

Author: cinemast

test/batchclient.cpp

@@ -35,20 +35,26 @@ TEST_CASE("batchrequest", TEST_MODULE) {
   BatchRequest br;
   TestClientConnector c;
   json request = br.AddMethodCall(1, "some_method1", {"value1"})
+                     .AddMethodCall("1", "some_method1", {"value1"})
                      .AddNamedMethodCall(2, "some_method2", {{"param1", "value1"}})
+                     .AddNamedMethodCall("2", "some_method2", {{"param1", "value1"}})
                      .AddNotificationCall("some_notification1", {"value2"})
                      .AddNamedNotificationCall("some_notification2", {{"param2", "value2"}})
                      .Build();
 
   CHECK(request.is_array());
-  CHECK(request.size() == 4);
+  CHECK(request.size() == 6);
   c.Send(request[0].dump());
   c.VerifyMethodRequest(version::v2, "some_method1", 1);
   c.Send(request[1].dump());
-  c.VerifyMethodRequest(version::v2, "some_method2", 2);
+  c.VerifyMethodRequest(version::v2, "some_method1", "1");
   c.Send(request[2].dump());
-  c.VerifyNotificationRequest(version::v2, "some_notification1");
+  c.VerifyMethodRequest(version::v2, "some_method2", 2);
   c.Send(request[3].dump());
+  c.VerifyMethodRequest(version::v2, "some_method2", "2");
+  c.Send(request[4].dump());
+  c.VerifyNotificationRequest(version::v2, "some_notification1");
+  c.Send(request[5].dump());
   c.VerifyNotificationRequest(version::v2, "some_notification2");
 }
 

test/dispatcher.cpp

@@ -20,6 +20,7 @@ TEST_CASE("add and invoke positional", TEST_MODULE) {
 
   procCache = "";
   CHECK(d.Add("some notification", GetHandle(&some_procedure)));
+  CHECK(!d.Add("some notification", GetHandle(&some_procedure)));
   d.InvokeNotification("some notification", {"some string"});
   CHECK(procCache == "some string");
 }
@@ -65,4 +66,22 @@ TEST_CASE("error on invoking unsupported named parameter", TEST_MODULE) {
   REQUIRE_THROWS_WITH(d.InvokeNotification("some notification", p), Contains("invalid parameter: procedure doesn't support named parameter"));
 }
 
+TEST_CASE("passing invalid literal as param", TEST_MODULE) {
+    Dispatcher d;
+    CHECK(d.Add("some method", GetHandle(&add_function)));
+    REQUIRE_THROWS_WITH(d.InvokeMethod("some method", true), Contains("invalid request: params field must be an array, object"));
+}
+
+TEST_CASE("dispatching unknown procedures", TEST_MODULE) {
+    Dispatcher d;
+    REQUIRE_THROWS_WITH(d.InvokeMethod("some method", {1}), Contains("method not found"));
+    REQUIRE_THROWS_WITH(d.InvokeNotification("some notification", {1}), Contains("notification not found"));
+}
+
+TEST_CASE("invalid param types", TEST_MODULE) {
+    Dispatcher d;
+    CHECK(d.Add("some method", GetHandle(&add_function)));
+    CHECK_THROWS_WITH(d.InvokeMethod("some method", {"string1", "string2"}), Contains("invalid parameter: must be unsigned integer, but is string for parameter 0"));
+}
+
 // TODO: avoid signed, unsigned bool invocations