[Libreoffice-commits] online.git: 3 commits - loolwsd/test

[Jan Holesovsky]

 loolwsd/test/UnitAdmin.cpp  |    4 ++++
 loolwsd/test/httpwstest.cpp |    2 +-
 loolwsd/test/run_unit.sh.in |    2 +-
 3 files changed, 6 insertions(+), 2 deletions(-)

New commits:
commit feb359e3a9ec2ede45659927b53a277a4a15824e
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Tue Sep 27 19:27:15 2016 +0200

    CPPUNIT_ASSERT_EQUAL.
    
    Change-Id: Ifb0fe46101e243b5f562fb6a63ea350b42f445c0

diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp
index ab27da3..640938b 100644
--- a/loolwsd/test/httpwstest.cpp
+++ b/loolwsd/test/httpwstest.cpp
@@ -228,7 +228,7 @@ void HTTPWSTest::testBadRequest()
         session->setKeepAlive(true);
         session->sendRequest(request);
         session->receiveResponse(response);
-        CPPUNIT_ASSERT(response.getStatus() == Poco::Net::HTTPResponse::HTTPResponse::HTTP_SERVICE_UNAVAILABLE);
+        CPPUNIT_ASSERT_EQUAL(Poco::Net::HTTPResponse::HTTPResponse::HTTP_SERVICE_UNAVAILABLE, response.getStatus());
     }
     catch (const Poco::Exception& exc)
     {
commit 26bec64e2061b3878f0454d5dedfdbac43200f2b
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Tue Sep 27 18:18:23 2016 +0200

    Make the advice about gdb actually useful.
    
    Change-Id: I5b95c79cce5c3b30b3d07210ec7b7a04fdb3067d

diff --git a/loolwsd/test/run_unit.sh.in b/loolwsd/test/run_unit.sh.in
index 404e011..764c258 100755
--- a/loolwsd/test/run_unit.sh.in
+++ b/loolwsd/test/run_unit.sh.in
@@ -99,7 +99,7 @@ else # newer unit tests.
         cat "$tst_log"
         echo "============================================================="
         echo "Test failed on unit: $tst re-run with:"
-        echo "   $ gdb ${abs_top_builddir}/loolwsd --o:sys_template_path=\"$systemplate_path\" \\"
+        echo "   $ gdb --args ${abs_top_builddir}/loolwsd --o:sys_template_path=\"$systemplate_path\" \\"
         echo "         --o:lo_template_path=\"$lo_path\" \\"
         echo "         --o:child_root_path=\"$jails_path\" \\"
         echo "         --o:storage.filesystem[@allow]=true \\"
commit bfbc56f0456c0db5306b63d845c5882d8372fc4a
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Tue Sep 27 18:08:34 2016 +0200

    JWT token generation does not work without SSL, disable the appropriate tests.
    
    Change-Id: Id25a6507ea11a1e3cfacc8b833d4fd404eaeae27

diff --git a/loolwsd/test/UnitAdmin.cpp b/loolwsd/test/UnitAdmin.cpp
index f43c316..36bebfc 100644
--- a/loolwsd/test/UnitAdmin.cpp
+++ b/loolwsd/test/UnitAdmin.cpp
@@ -412,8 +412,11 @@ public:
 
         // Register tests here.
         _tests.push_back(&UnitAdmin::testIncorrectPassword);
+#if ENABLE_SSL
         _tests.push_back(&UnitAdmin::testCorrectPassword);
+#endif
         _tests.push_back(&UnitAdmin::testWebSocketWithoutAuthToken);
+#if ENABLE_SSL
         _tests.push_back(&UnitAdmin::testWebSocketWithIncorrectAuthToken);
         _tests.push_back(&UnitAdmin::testAddDocNotify);
         _tests.push_back(&UnitAdmin::testUsersCount);
@@ -421,6 +424,7 @@ public:
         // FIXME make this one reliable, and enable again _tests.push_back(&UnitAdmin::testRmDocNotify);
         _tests.push_back(&UnitAdmin::testUsersCount);
         _tests.push_back(&UnitAdmin::testDocCount);
+#endif
     }
 
     // Runs tests sequentially in _tests