Working through more warnings

Author: freesurfer-rge

CMakeLists.txt

@@ -31,6 +31,7 @@ if (COMPILE_TESTS)
         target_link_libraries(coverage_config INTERFACE --coverage)
     endif ()
     add_executable(jsonrpccpp-test test/main.cpp test/client.cpp test/typemapper.cpp test/dispatcher.cpp test/server.cpp test/batchclient.cpp test/testclientconnector.hpp examples/warehouse/warehouseapp.cpp test/warehouseapp.cpp)
+    target_compile_options(jsonrpccpp-test PUBLIC "${_warning_opts}")
     target_include_directories(jsonrpccpp-test PRIVATE vendor examples)
     target_link_libraries(jsonrpccpp-test coverage_config json-rpc-cxx)
     enable_testing()

test/client.cpp

@@ -13,7 +13,7 @@ struct F {
   TestClientConnector c;
   JsonRpcClient clientV1;
   JsonRpcClient clientV2;
-  F() : clientV1(c, version::v1), clientV2(c, version::v2) {}
+  F() : c(), clientV1(c, version::v1), clientV2(c, version::v2) {}
 };
 
 TEST_CASE_METHOD(F, "v2_method_noparams", TEST_MODULE) {
@@ -256,4 +256,4 @@ TEST_CASE_METHOD(F, "v1_notification_call_params_byposition", TEST_MODULE) {
   CHECK(c.request["params"][2] == true);
 }
 
-// TODO: test cases with return type mapping and param mapping for v1/v2 method and notification
+// TODO: test cases with return type mapping and param mapping for v1/v2 method and notification

test/testclientconnector.hpp

@@ -11,6 +11,8 @@ using namespace std;
 
 class TestClientConnector : public IClientConnector {
 public:
+  TestClientConnector() : request(), raw_response() {}
+
   json request;
   string raw_response;
 
@@ -64,4 +66,4 @@ class TestClientConnector : public IClientConnector {
       CHECK(has_key(request, "params"));
     }
   }
-};
+};

test/typemapper.cpp

@@ -85,21 +85,34 @@ TEST_CASE("test incorrect params", TEST_MODULE) {
 enum class category { order, cash_carry };
 
 struct product {
+  product() : id(), price(), name(), cat() {}
   int id;
   double price;
   string name;
   category cat;
 };
 
-NLOHMANN_JSON_SERIALIZE_ENUM(category, {{category::order, "order"}, {category::cash_carry, "cc"}});
+NLOHMANN_JSON_SERIALIZE_ENUM(category, {{category::order, "order"}, {category::cash_carry, "cc"}})
 
 void to_json(json &j, const product &p) { j = json{{"id", p.id}, {"price", p.price}, {"name", p.name}, {"category", p.cat}}; }
 
 product get_product(int id) {
-  if (id == 1)
-    return product{1, 22.50, "some product", category::order};
-  else if (id == 2)
-    return product{2, 55.50, "some product 2", category::cash_carry};
+  if (id == 1) {
+    product p;
+    p.id = 1;
+    p.price = 22.50;
+    p.name = "some product";
+    p.cat = category::order;
+    return p;
+  }
+  else if (id == 2) {
+    product p;
+    p.id = 2;
+    p.price = 55.50;
+    p.name = "some product 2";
+    p.cat = category::cash_carry;
+    return p;
+  }
   throw JsonRpcException(-50000, "product not found");
 }
 
@@ -131,7 +144,7 @@ static vector<product> catalog;
 bool add_products(const vector<product> &products) {
   std::copy(products.begin(), products.end(), std::back_inserter(catalog));
   return true;
-};
+}
 
 TEST_CASE("test with custom params", TEST_MODULE) {
   MethodHandle mh = GetHandle(&add_products);
@@ -175,4 +188,4 @@ TEST_CASE("test number range checking", TEST_MODULE) {
   unsigned short max_ss = numeric_limits<short>::max();
   CHECK(mh2({max_su, max_ss}) == max_su + max_ss);
   REQUIRE_THROWS_WITH(mh2({max_su, max_su}), Contains("invalid parameter: exceeds value range of integer"));
-}
+}