loolwsd/test/UnitAdmin.cpp | 35 +++++++++++++++++++++++++++-------- 1 file changed, 27 insertions(+), 8 deletions(-)
New commits: commit 4c053e864f162a79f9e8b2c8584d14a16b650dc7 Author: Pranav Kant <[email protected]> Date: Wed Jun 1 14:38:24 2016 +0530 loolwsd: unit-admin: More debug info Change-Id: I0a529915ab9383ce05a76b8291651663324c8fe8 diff --git a/loolwsd/test/UnitAdmin.cpp b/loolwsd/test/UnitAdmin.cpp index 1a5c2af..5100e6c 100644 --- a/loolwsd/test/UnitAdmin.cpp +++ b/loolwsd/test/UnitAdmin.cpp @@ -305,7 +305,6 @@ private: { _messageReceived.clear(); - // We should have 3 users by now; lets verify const std::string queryMessage = "active_users_count"; _adminWs->sendFrame(queryMessage.data(), queryMessage.size()); @@ -313,17 +312,23 @@ private: if (_messageReceived.empty() && _messageReceivedCV.wait_for(lock, std::chrono::milliseconds(_messageTimeoutMilliSeconds)) == std::cv_status::timeout) { - Log::info("testAddDocNotify: Timed out waiting for admin console message"); + Log::info("testUsersCount: Timed out waiting for admin console message"); return TestResult::TEST_TIMED_OUT; } lock.unlock(); StringTokenizer tokens(_messageReceived, " ", StringTokenizer::TOK_IGNORE_EMPTY | StringTokenizer::TOK_TRIM); if (tokens.count() != 2 || - tokens[0] != "active_users_count" || - std::stoi(tokens[1]) != _usersCount) + tokens[0] != "active_users_count") { - Log::info("testAddDocNotify: Unrecognized message format"); + Log::info("testUsersCount: Unrecognized message format"); + return TestResult::TEST_FAILED; + } + else if (std::stoi(tokens[1]) != _usersCount) + { + Log::info("testUsersCount: Incorrect users count " + ", expected: " + std::to_string(_usersCount) + + ", actual: " + tokens[1]); return TestResult::TEST_FAILED; } @@ -335,7 +340,6 @@ private: { _messageReceived.clear(); - // We should have 2 total docs open by now; lets verify const std::string queryMessage = "active_docs_count"; _adminWs->sendFrame(queryMessage.data(), queryMessage.size()); @@ -343,7 +347,7 @@ private: if (_messageReceived.empty() && _messageReceivedCV.wait_for(lock, std::chrono::milliseconds(_messageTimeoutMilliSeconds)) == std::cv_status::timeout) { - Log::info("testAddDocNotify: Timed out waiting for admin console message"); + Log::info("testDocCount: Timed out waiting for admin console message"); return TestResult::TEST_TIMED_OUT; } lock.unlock(); @@ -353,7 +357,14 @@ private: tokens[0] != "active_docs_count" || std::stoi(tokens[1]) != _docsCount) { - Log::info("testAddDocNotify: Unrecognized message format"); + Log::info("testDocCount: Unrecognized message format"); + return TestResult::TEST_FAILED; + } + else if (std::stoi(tokens[1]) != _docsCount) + { + Log::info("testDocCount: Incorrect doc count " + ", expected: " + std::to_string(_docsCount) + + ", actual: " + tokens[1]); return TestResult::TEST_FAILED; } @@ -417,7 +428,9 @@ public: { _isTestRunning = true; AdminTest test = _tests[_testCounter++]; + Log::info("UnitAdmin:: Starting test #" + std::to_string(_testCounter)); TestResult res = ((*this).*(test))(); + Log::info("UnitAdmin:: Finished test #" + std::to_string(_testCounter)); if (res != TestResult::TEST_OK) { exitTest(res); @@ -437,6 +450,7 @@ public: std::unique_lock<std::mutex> lock(_messageReceivedMutex); _messageReceivedCV.notify_all(); _messageReceived = message; + Log::info("UnitAdmin:: onAdminNotifyMessage: " + message); } virtual void onAdminQueryMessage(const std::string& message) @@ -444,6 +458,7 @@ public: std::unique_lock<std::mutex> lock(_messageReceivedMutex); _messageReceivedCV.notify_all(); _messageReceived = message; + Log::info("UnitAdmin:: onAdminQueryMessage: " + message); } }; commit b58801c6b088446669b5f9ef931677eaea464208 Author: Pranav Kant <[email protected]> Date: Wed Jun 1 14:12:05 2016 +0530 loolwsd: unit-admin, log when test passes Change-Id: I9714a8dc57b22ecff3ef4a421192d08a8f3f10e1 diff --git a/loolwsd/test/UnitAdmin.cpp b/loolwsd/test/UnitAdmin.cpp index 133413c..1a5c2af 100644 --- a/loolwsd/test/UnitAdmin.cpp +++ b/loolwsd/test/UnitAdmin.cpp @@ -297,6 +297,7 @@ private: } _docsCount++; + Log::info(std::string("testAddDocNotify: OK")); return TestResult::TEST_OK; } @@ -326,6 +327,7 @@ private: return TestResult::TEST_FAILED; } + Log::info(std::string("testUsersCount: OK")); return TestResult::TEST_OK; } @@ -355,6 +357,7 @@ private: return TestResult::TEST_FAILED; } + Log::info(std::string("testDocCount: OK")); return TestResult::TEST_OK; } @@ -386,6 +389,7 @@ private: } _usersCount--; + Log::info(std::string("testRmDocNotify: OK")); return TestResult::TEST_OK; } _______________________________________________ Libreoffice-commits mailing list [email protected] https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
