Merge pull request LedgerHQ#37 from teams2ua/develop

Fix some tests for MSVC

.gitignore

@@ -21,3 +21,4 @@ core/lib/secp256k1/tmp/
 node_modules
 api/djinni/support-lib/*.mk
 api/djinni/support-lib/*.Makefile
+.vscode/

CMakeLists.txt

@@ -11,7 +11,7 @@ include(UseBackportedModules)
 # The project version number.
 set(VERSION_MAJOR   1   CACHE STRING "Project major version number.")
 set(VERSION_MINOR   1   CACHE STRING "Project minor version number.")
-set(VERSION_PATCH   3   CACHE STRING "Project patch version number.")
+set(VERSION_PATCH   4   CACHE STRING "Project patch version number.")
 mark_as_advanced(VERSION_MAJOR VERSION_MINOR VERSION_PATCH)
 
 set(CMAKE_RUNTIME_OUTPUT_DIRECTORY build)

appveyor.yml

@@ -5,12 +5,10 @@ branches:
 image:
 - Visual Studio 2015
 environment:
-  LIB_VERSION: 1.1.3 #Hardcode the LIB_VERSION : should be retrieved by building libcore node module and run tests/lib_version.js
+  LIB_VERSION: 1.1.4 #Hardcode the LIB_VERSION : should be retrieved by building libcore node module and run tests/lib_version.js
   nodejs_version: "9"
   appveyor_rdp_password:
     secure: jb1LsDmcxCww7tA38S3xSw==
-  priv_key:
-    secure: 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
   pub_key:
     secure: B+4FNFeW6sbRsl7XJYnHUYptAx/2AvV7XySuhhEMdvcloUz0YXxgX/EguKV2Bvm5GaBKYLlq4G2Lw7udm4l68I9g3x+2pZvWiMBUhTRaTGVqi8PXXN+RON62G77yR9Lt/zUR+ljVjuJmRqQBU3NkzOJAAfZ/RDOCAEcWkA3cEE64IkfpqOTHBPW0PpwZcPGFF/l4MGdP8r5XIeu/WwPZHfQjGnDlME0VgkRWflA/Pjt0GcyDSLURXQBk+5JJhn9FjGPCKD+db4xQkW7zhep/su5urEf0HYTmVHRiKMZNfBPGSnL/Lmr6343qc6YF78lyX2U9saoJrf+tuxqAHtUq0KhkHltbNeIUaxvcC7TcH+kEm/Uxl/al8iRiMWE86b8z/wiFQI1xA+oejrFQivbyZVJ+cOifoZ7HhYwP+niOnUG+ZzT5WFLejnsnd4Lwdi5XzWaKKooIPtZ9qcyk15SFzVBayEeeljNk/gByrT6U+25LUqO6ekXrZ+A86Tmjkhp67B5+JNxis+k3sCZ63ASP6LhL9NvrVNky1ZGB8WAZ/hs=
   matrix:

core/src/collections/DynamicObject.cpp

@@ -97,7 +97,7 @@ namespace ledger {
 
         optional<std::string> DynamicObject::getString(const std::string &key) {
             auto v = _values.lift(key);
-            if (_values.empty() || !v.hasValue() || v.getValue().type != api::DynamicType::STRING)
+            if (!v.hasValue() || v.getValue().type != api::DynamicType::STRING)
                 return optional<std::string>();
             return optional<std::string>(v.getValue().string);
         }

core/src/collections/MapLike.hpp

@@ -83,9 +83,11 @@ namespace ledger {
             }
 
             Option<V> lift(const K &key) const {
-                return Try<V>::from([this, &key] () {
-                    return at(key);
-                }).toOption();
+                auto it = _container.find(key);
+                if (it == _container.end()) {
+                    return Option<V>::NONE;
+                }
+                return Option<V>(it->second);
             }
 
             bool contains(const K &key) const {

core/src/debug/RotatingEncryptableSink.cpp

@@ -60,11 +60,10 @@ namespace ledger {
 
         void RotatingEncryptableSink::log(const spdlog::details::log_msg &msg) {
             auto context = _context;
-            std::string message = msg.formatted.data();
-            auto size = msg.formatted.size();
+            std::string message = msg.formatted.str();
             auto self = shared_from_this();
-            context->execute(make_runnable([self, message, size] () {
-                self->_sink_it(message, size);
+            context->execute(make_runnable([self, message] () {
+                self->_sink_it(message);
             }));
         }
 
@@ -75,13 +74,13 @@ namespace ledger {
             }));
         }
 
-        void RotatingEncryptableSink::_sink_it(std::string msg, std::size_t size) {
+        void RotatingEncryptableSink::_sink_it(std::string msg) {
             // TODO: implement encryption
-            _current_size += size;
+            _current_size += msg.size();
             if (_current_size > _max_size)
             {
                 _rotate();
-                _current_size = size;
+                _current_size = msg.size();
             }
 
             spdlog::details::log_msg spdlog_msg;

core/src/debug/RotatingEncryptableSink.hpp

@@ -58,7 +58,7 @@ namespace ledger {
             virtual void flush() override;
 
         protected:
-            void _sink_it(std::string msg, std::size_t size);
+            void _sink_it(std::string msg);
 
         private:
             static spdlog::filename_t calc_filename(

core/src/utils/DateUtils.cpp

@@ -36,12 +36,11 @@
 
 
 #if defined(_WIN32) || defined(_WIN64)
-    #if defined(_MSC_VER) && _MSC_VER <= 1900
-        long shift = 0;
-        int result = _get_timezone(&shift);
-        #define timezone  shift
+    #if defined(_MSC_VER)
+        time_t timegm(struct tm* tm) { return _mkgmtime(tm); }
+    #else
+        time_t timegm(struct tm* tm) { return mktime(tm) - timezone; }
     #endif
-time_t timegm(struct tm* tm) { return mktime(tm) - timezone; }
 #endif
 
 std::chrono::system_clock::time_point ledger::core::DateUtils::fromJSON(const std::string &str) {

core/test/bytes/byteswriter_tests.cpp

@@ -37,21 +37,13 @@ using namespace ledger::core;
 TEST(BytesWriter, WriteBeValues) {
     EXPECT_EQ(BytesWriter().writeBeValue(12U).toByteArray(), std::vector<uint8_t>({0x00, 0x00, 0x00, 12}));
     EXPECT_EQ(BytesWriter().writeBeValue((uint8_t)12).toByteArray(), std::vector<uint8_t>({12}));
-#ifdef __MINGW32__
     EXPECT_EQ(BytesWriter().writeBeValue(12ULL).toByteArray(), std::vector<uint8_t>({0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 12}));
-#else
-    EXPECT_EQ(BytesWriter().writeBeValue(12UL).toByteArray(), std::vector<uint8_t>({0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 12}));
-#endif
 }
 
 TEST(BytesWriter, WriteLeValues) {
     EXPECT_EQ(BytesWriter().writeLeValue(12U).toByteArray(), std::vector<uint8_t>({12, 0x00, 0x00, 00}));
     EXPECT_EQ(BytesWriter().writeLeValue((uint8_t)12).toByteArray(), std::vector<uint8_t>({12}));
-#ifdef __MINGW32__
     EXPECT_EQ(BytesWriter().writeLeValue(12ULL).toByteArray(), std::vector<uint8_t>({12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}));
-#else
-    EXPECT_EQ(BytesWriter().writeLeValue(12UL).toByteArray(), std::vector<uint8_t>({12, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00}));
-#endif
 }
 
 TEST(BytesWriter, WriteVarInt) {

core/test/debug/logger_test.cpp

@@ -29,16 +29,16 @@
  *
  */
 
-#include <gtest/gtest.h>
 #include <EventLooper.hpp>
 #include <EventThread.hpp>
 #include <NativeThreadDispatcher.hpp>
 #include <NativePathResolver.hpp>
-#include <fstream>
-#include <ledger/core/debug/logger.hpp>
 #include <CoutLogPrinter.hpp>
-#include <iostream>
+#include <ledger/core/debug/logger.hpp>
 #include <ledger/core/utils/optional.hpp>
+#include <spdlog/details/os.h>
+#include <gtest/gtest.h>
+#include <iostream>
 #include <string>
 #include <fstream>
 #include <streambuf>
@@ -47,13 +47,13 @@ TEST(LoggerTest, LogAndOverflow) {
     auto dispatcher = std::make_shared<NativeThreadDispatcher>();
     auto logPrinter = std::make_shared<CoutLogPrinter>(dispatcher->getMainExecutionContext());
     auto resolver = std::make_shared<NativePathResolver>();
-
+    auto logLineExample = std::string("2017-03-02T10:07:06Z+01:00 D: This is a log XXX") + spdlog::details::os::default_eol;
     std::shared_ptr<spdlog::logger> logger = ledger::core::logger::create("test_logs",
                                                std::experimental::optional<std::string>(),
                                                dispatcher->getSerialExecutionContext("logger"),
                                                resolver,
                                                logPrinter,
-                                                                          (std::string("2017-03-02T10:07:06Z+01:00 D: This is a log \n").size() + 3) * 199
+                                               logLineExample.size() * 199
     );
     dispatcher->getMainExecutionContext()->execute(make_runnable([=] () {
         for (auto i = 0; i < 200; i++) {
@@ -79,13 +79,13 @@ TEST(LoggerTest, LogNoOverflow) {
     auto dispatcher = std::make_shared<NativeThreadDispatcher>();
     auto logPrinter = std::make_shared<CoutLogPrinter>(dispatcher->getMainExecutionContext());
     auto resolver = std::make_shared<NativePathResolver>();
-
+    auto logLineExample = std::string("2017-03-02T10:07:06Z+01:00 D: This is a log XXX") + spdlog::details::os::default_eol;
     std::shared_ptr<spdlog::logger> logger = ledger::core::logger::create("test_logs_1",
                                                                           std::experimental::optional<std::string>(),
                                                                           dispatcher->getSerialExecutionContext("logger"),
                                                                           resolver,
                                                                           logPrinter,
-                                                                          (std::string("2017-03-02T10:07:06Z+01:00 D: This is a log \n").size() + 3) * 200
+                                                                          logLineExample.size() * 200
     );
     dispatcher->getMainExecutionContext()->execute(make_runnable([=] () {
         for (auto i = 0; i < 200; i++) {

core/test/lib/libledger-test/MongooseHttpClient.cpp

@@ -159,7 +159,7 @@ void MongooseHttpClient::execute(const std::shared_ptr<ledger::core::api::HttpRe
         }
 
         nc = mg_connect_http(&_mgr, ::ev_handler, method.c_str(), request->getUrl().c_str(), headers.str().c_str(), c_body); // Pass headers and body data
-
+        assert(nc != nullptr);
         nc->user_data = new std::pair<std::shared_ptr<ledger::core::api::HttpRequest>, std::shared_ptr<MongooseHttpClient>>(request, self);
         mg_set_protocol_http_websocket(nc);
     }));

core/test/net/CMakeLists.txt

@@ -1,5 +1,6 @@
 cmake_minimum_required(VERSION 3.0)
 include_directories(${gtest_SOURCE_DIR}/include ${gtest_SOURCE_DIR})
+include_directories(${gmock_SOURCE_DIR}/include ${gmock_SOURCE_DIR})
 include_directories(${CMAKE_BINARY_DIR}/include)
 if (APPLE)
     add_definitions(-DGTEST_USE_OWN_TR1_TUPLE)
@@ -11,6 +12,7 @@ include_directories(../lib/libledger-test/)
 add_executable(ledger-core-net-tests main.cpp http_client_tests.cpp websocket_client_tests.cpp)
 
 target_link_libraries(ledger-core-net-tests gtest gtest_main)
+target_link_libraries(ledger-core-net-tests gmock)
 target_link_libraries(ledger-core-net-tests ledger-core)
 target_link_libraries(ledger-core-net-tests ledger-test)
 target_link_libraries(ledger-core-net-tests ledger-qt-host)

core/test/net/http_client_tests.cpp

@@ -60,7 +60,7 @@ TEST(HttpClient, GET) {
     auto dispatcher = std::make_shared<NativeThreadDispatcher>();
     auto client = std::make_shared<MongooseHttpClient>(dispatcher->getSerialExecutionContext("client"));
     auto worker = dispatcher->getSerialExecutionContext("worker");
-    ledger::core::HttpClient http("http://localhost:8000", client, worker);
+    ledger::core::HttpClient http("http://127.0.0.1:8000", client, worker);
     {
         auto server = std::make_shared<MongooseSimpleRestServer>(dispatcher->getSerialExecutionContext("server"));
 
@@ -94,7 +94,7 @@ TEST(HttpClient, GETJson) {
     auto dispatcher = std::make_shared<NativeThreadDispatcher>();
     auto client = std::make_shared<MongooseHttpClient>(dispatcher->getSerialExecutionContext("client"));
     auto worker = dispatcher->getSerialExecutionContext("worker");
-    ledger::core::HttpClient http("http://localhost:8000", client, worker);
+    ledger::core::HttpClient http("http://127.0.0.1:8000", client, worker);
     {
         auto server = std::make_shared<MongooseSimpleRestServer>(dispatcher->getSerialExecutionContext("server"));
 
@@ -127,7 +127,7 @@ TEST(HttpClient, GETJsonError) {
     auto dispatcher = std::make_shared<NativeThreadDispatcher>();
     auto client = std::make_shared<MongooseHttpClient>(dispatcher->getSerialExecutionContext("client"));
     auto worker = dispatcher->getSerialExecutionContext("worker");
-    ledger::core::HttpClient http("http://localhost:8000", client, worker);
+    ledger::core::HttpClient http("http://127.0.0.1:8000", client, worker);
     {
         auto server = std::make_shared<MongooseSimpleRestServer>(dispatcher->getSerialExecutionContext("server"));
 
@@ -161,7 +161,7 @@ TEST(HttpClient, POST) {
     auto dispatcher = std::make_shared<NativeThreadDispatcher>();
     auto client = std::make_shared<MongooseHttpClient>(dispatcher->getSerialExecutionContext("client"));
     auto worker = dispatcher->getSerialExecutionContext("worker");
-    ledger::core::HttpClient http("http://localhost:8000", client, worker);
+    ledger::core::HttpClient http("http://127.0.0.1:8000", client, worker);
     {
         auto server = std::make_shared<MongooseSimpleRestServer>(dispatcher->getSerialExecutionContext("server"));
 
@@ -237,7 +237,7 @@ TEST(HttpClient, GETWithSax) {
     auto dispatcher = std::make_shared<NativeThreadDispatcher>();
     auto client = std::make_shared<MongooseHttpClient>(dispatcher->getSerialExecutionContext("client"));
     auto worker = dispatcher->getSerialExecutionContext("worker");
-    ledger::core::HttpClient http("http://localhost:8000", client, worker);
+    ledger::core::HttpClient http("http://127.0.0.1:8000", client, worker);
     {
         auto server = std::make_shared<MongooseSimpleRestServer>(dispatcher->getSerialExecutionContext("server"));
 
@@ -317,7 +317,7 @@ TEST(HttpClient, GETWithSaxError) {
     auto dispatcher = std::make_shared<NativeThreadDispatcher>();
     auto client = std::make_shared<MongooseHttpClient>(dispatcher->getSerialExecutionContext("client"));
     auto worker = dispatcher->getSerialExecutionContext("worker");
-    ledger::core::HttpClient http("http://localhost:8000", client, worker);
+    ledger::core::HttpClient http("http://127.0.0.1:8000", client, worker);
     {
         auto server = std::make_shared<MongooseSimpleRestServer>(dispatcher->getSerialExecutionContext("server"));