From c300bc8b6816596826305eede9679c7cecce3036 Mon Sep 17 00:00:00 2001 From: Sepehr Laal Date: Sun, 10 Sep 2017 13:53:26 -0700 Subject: [PATCH] fixed invalid calls to CHECK for non-windows platforms --- test/sio_test.cpp | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) diff --git a/test/sio_test.cpp b/test/sio_test.cpp index 45143d2b..2ee159bb 100644 --- a/test/sio_test.cpp +++ b/test/sio_test.cpp @@ -105,21 +105,29 @@ TEST_CASE( "test_packet_accept_4" ) size_t json_start = payload.find("{"); REQUIRE(json_start!=std::string::npos); std::string header = payload.substr(0,json_start); - CHECK(header=="452-/nsp,1001",std::string("outputing payload header:")+header); + CHECK(header=="452-/nsp,1001"); + INFO("outputing payload:" << payload) std::string json = payload.substr(json_start); nlohmann::json j = nlohmann::json::parse(json); - CHECK(j["desc"].get() == "Bin of 100 bytes", std::string("outputing payload desc:") + j["desc"].get()); - CHECK((bool)j["bin1"]["_placeholder"] , std::string("outputing payload bin1:") + j["bin1"].dump()); - CHECK((bool)j["bin2"]["_placeholder"] , std::string("outputing payload bin2:") + j["bin2"].dump()); + CHECK(j["desc"].get() == "Bin of 100 bytes"); + INFO("outputing payload desc::" << j["desc"].get()) + CHECK((bool)j["bin1"]["_placeholder"]); + INFO("outputing payload bin1:" << j["bin1"].dump()) + CHECK((bool)j["bin2"]["_placeholder"]); + INFO("outputing payload bin2:" << j["bin2"].dump()) int bin1Num = j["bin1"]["num"].get(); char numchar[] = {0,0}; numchar[0] = bin1Num+'0'; - CHECK(buffers[bin1Num]->length()==101 , std::string("outputing payload bin1 num:")+numchar); - CHECK(buffers[bin1Num]->at(50)==0 && buffers[bin1Num]->at(0) == packet::frame_message); + CHECK(buffers[bin1Num]->length()==101); + INFO("outputing payload bin1 num:" << numchar) + CHECK(buffers[bin1Num]->at(50)==0); + CHECK(buffers[bin1Num]->at(0) == packet::frame_message); int bin2Num = j["bin2"]["num"].get(); numchar[0] = bin2Num+'0'; - CHECK(buffers[bin2Num]->length()==51 , std::string("outputing payload bin2 num:") + numchar); - CHECK(buffers[bin2Num]->at(25)==1 && buffers[bin2Num]->at(0) == packet::frame_message); + CHECK(buffers[bin2Num]->length()==51); + INFO("outputing payload bin2 num:" << numchar) + CHECK(buffers[bin2Num]->at(25)==1); + CHECK(buffers[bin2Num]->at(0) == packet::frame_message); } #endif