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

[Jan Holesovsky]

 loolwsd/test/Makefile.am   |    1 +
 loolwsd/test/UnitAdmin.cpp |    5 ++---
 2 files changed, 3 insertions(+), 3 deletions(-)

New commits:
commit dd9aeb8637e9505e752b066474372fc93ad20b8d
Author: Jan Holesovsky <kendy at collabora.com>
Date:   Tue Sep 27 17:38:17 2016 +0200

    Use cppunit macros.
    
    Change-Id: Ie56113a95dfc07b39f64a7ed0ce50efb1fa7081b

diff --git a/loolwsd/test/Makefile.am b/loolwsd/test/Makefile.am
index ab0918c..6bd6d73 100644
--- a/loolwsd/test/Makefile.am
+++ b/loolwsd/test/Makefile.am
@@ -35,6 +35,7 @@ test_LDADD = $(CPPUNIT_LIBS)
 # unit test modules:
 unit_fuzz_la_SOURCES = UnitFuzz.cpp
 unit_admin_la_SOURCES = UnitAdmin.cpp
+unit_admin_la_LIBADD = $(CPPUNIT_LIBS)
 unit_admin_la_CPPFLAGS = -DTDOC=\"$(top_srcdir)/test/data\"
 unit_fonts_la_SOURCES = UnitFonts.cpp
 unit_timeout_la_SOURCES = UnitTimeout.cpp
diff --git a/loolwsd/test/UnitAdmin.cpp b/loolwsd/test/UnitAdmin.cpp
index af78344..f43c316 100644
--- a/loolwsd/test/UnitAdmin.cpp
+++ b/loolwsd/test/UnitAdmin.cpp
@@ -9,7 +9,6 @@
 
 #include "config.h"
 
-#include <cassert>
 #include <condition_variable>
 #include <mutex>
 
@@ -102,9 +101,9 @@ private:
         response.getCookies(cookies);
 
         // For now we only set one cookie
-        assert(cookies.size() == 1);
+        CPPUNIT_ASSERT_EQUAL(1, static_cast<int>(cookies.size()));
         // and it is jwt=
-        assert(cookies[0].getName() == "jwt");
+        CPPUNIT_ASSERT_EQUAL(std::string("jwt"), cookies[0].getName());
 
         // Check cookie properties
         std::string cookiePath = cookies[0].getPath();