1 files changed, 22 insertions, 25 deletions

diff --git a/tests/unittest.cpp b/tests/unittest.cpp
index 164cbf0..a85f7bc 100644
--- a/tests/unittest.cpp
+++ b/tests/unittest.cpp
@@ -3,16 +3,9 @@
 #include <iostream>
 #include <sstream>
 #include <vector>
-#include "settings.h"
+#include "crow.h"
 #undef CROW_LOG_LEVEL
 #define CROW_LOG_LEVEL 0
-#include "routing.h"
-#include "utility.h"
-#include "crow.h"
-#include "json.h"
-#include "mustache.h"
-#include "middleware.h"
-#include "query_string.h"
 
 using namespace std;
 using namespace crow;
@@ -38,7 +31,7 @@ template <typename ...Args>
 void fail(Args...args) { error_print(args...);failed__ = true; }
 
 #define ASSERT_TRUE(x) if (!(x)) fail(__FILE__ ":", __LINE__, ": Assert fail: expected ", #x, " is true, at " __FILE__ ":",__LINE__)
-#define ASSERT_EQUAL(a, b) if ((a) != (b)) fail(__FILE__ ":", __LINE__, ": Assert fail: expected ", (a), " actual " , (b),  ", " #a " == " #b ", at " __FILE__ ":",__LINE__)
+#define ASSERT_EQUAL(a, b) if ((a) != (b)) fail(__FILE__ ":", __LINE__, ": Assert fail: expected ", (a), " actual ", (b),  ", " #a " == " #b ", at " __FILE__ ":",__LINE__)
 #define ASSERT_NOTEQUAL(a, b) if ((a) == (b)) fail(__FILE__ ":", __LINE__, ": Assert fail: not expected ", (a), ", " #a " != " #b ", at " __FILE__ ":",__LINE__)
 #define ASSERT_THROW(x) \
     try \
@@ -323,12 +316,12 @@ TEST(http_method)
 
     CROW_ROUTE(app, "/get_only")
         .methods("GET"_method)
-    ([](const request& req){
+    ([](const request& /*req*/){
         return "get";
     });
     CROW_ROUTE(app, "/post_only")
         .methods("POST"_method)
-    ([](const request& req){
+    ([](const request& /*req*/){
         return "post";
     });
 
@@ -519,6 +512,10 @@ TEST(json_read)
     ASSERT_EQUAL(false, z["bools"][1].b());
     ASSERT_EQUAL(1.2, z["doubles"][0].d());
     ASSERT_EQUAL(-3.4, z["doubles"][1].d());
+
+    std::string s3 = R"({"uint64": 18446744073709551615})";
+    auto z1 = json::load(s3);
+    ASSERT_EQUAL(18446744073709551615ull, z1["uint64"].u());
 }
 
 TEST(json_read_real)
@@ -666,11 +663,11 @@ struct NullMiddleware
     struct context {};
 
     template <typename AllContext>
-    void before_handle(request& req, response& res, context& ctx, AllContext& all_ctx)
+    void before_handle(request&, response&, context&, AllContext&)
     {}
 
     template <typename AllContext>
-    void after_handle(request& req, response& res, context& ctx, AllContext& all_ctx)
+    void after_handle(request&, response&, context&, AllContext&)
     {}
 };
 
@@ -678,10 +675,10 @@ struct NullSimpleMiddleware
 {
     struct context {};
 
-    void before_handle(request& req, response& res, context& ctx)
+    void before_handle(request& /*req*/, response& /*res*/, context& /*ctx*/)
     {}
 
-    void after_handle(request& req, response& res, context& ctx)
+    void after_handle(request& /*req*/, response& /*res*/, context& /*ctx*/)
     {}
 };
 
@@ -703,13 +700,13 @@ struct IntSettingMiddleware
     struct context { int val; };
 
     template <typename AllContext>
-    void before_handle(request& req, response& res, context& ctx, AllContext& all_ctx)
+    void before_handle(request&, response&, context& ctx, AllContext& )
     {
         ctx.val = 1;
     }
 
     template <typename AllContext>
-    void after_handle(request& req, response& res, context& ctx, AllContext& all_ctx)
+    void after_handle(request&, response&, context& ctx, AllContext& )
     {
         ctx.val = 2;
     }
@@ -724,12 +721,12 @@ struct FirstMW
         std::vector<string> v;
     };
 
-    void before_handle(request& req, response& res, context& ctx)
+    void before_handle(request& /*req*/, response& /*res*/, context& ctx)
     {
         ctx.v.push_back("1 before");
     }
 
-    void after_handle(request& req, response& res, context& ctx)
+    void after_handle(request& /*req*/, response& /*res*/, context& ctx)
     {
         ctx.v.push_back("1 after");
         test_middleware_context_vector = ctx.v;
@@ -740,7 +737,7 @@ struct SecondMW
 {
     struct context {};
     template <typename AllContext>
-    void before_handle(request& req, response& res, context& ctx, AllContext& all_ctx)
+    void before_handle(request& req, response& res, context&, AllContext& all_ctx)
     {
         all_ctx.template get<FirstMW>().v.push_back("2 before");
         if (req.url == "/break")
@@ -748,7 +745,7 @@ struct SecondMW
     }
 
     template <typename AllContext>
-    void after_handle(request& req, response& res, context& ctx, AllContext& all_ctx)
+    void after_handle(request&, response&, context&, AllContext& all_ctx)
     {
         all_ctx.template get<FirstMW>().v.push_back("2 after");
     }
@@ -758,13 +755,13 @@ struct ThirdMW
 {
     struct context {};
     template <typename AllContext>
-    void before_handle(request& req, response& res, context& ctx, AllContext& all_ctx)
+    void before_handle(request&, response&, context&, AllContext& all_ctx)
     {
         all_ctx.template get<FirstMW>().v.push_back("3 before");
     }
 
     template <typename AllContext>
-    void after_handle(request& req, response& res, context& ctx, AllContext& all_ctx)
+    void after_handle(request&, response&, context&, AllContext& all_ctx)
     {
         all_ctx.template get<FirstMW>().v.push_back("3 after");
     }
@@ -1070,12 +1067,12 @@ TEST(route_dynamic)
     });
 
     app.route_dynamic("/set4")
-    ([&](const request& req){
+    ([&](const request&){
         x = 4;
         return "";
     });
     app.route_dynamic("/set5")
-    ([&](const request& req, response& res){
+    ([&](const request&, response& res){
         x = 5;
         res.end();
     });