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

[Ashod Nakashian]

 loolwsd/test/WhiteBoxTests.cpp |    1 -
 loolwsd/test/httpwstest.cpp    |    7 +------
 2 files changed, 1 insertion(+), 7 deletions(-)

New commits:
commit b18246569d3d309257f269e421236753c261dcc4
Author: Ashod Nakashian <ashod.nakash...@collabora.co.uk>
Date:   Mon May 9 00:44:08 2016 -0400

    loolwsd: verify the number lokit instance before and after each test
    
    Change-Id: Ia38475dc78ef5b4dc116a2d6f9791c7012985b5d
    Reviewed-on: https://gerrit.libreoffice.org/24782
    Reviewed-by: Ashod Nakashian <ashnak...@gmail.com>
    Tested-by: Ashod Nakashian <ashnak...@gmail.com>

diff --git a/loolwsd/test/WhiteBoxTests.cpp b/loolwsd/test/WhiteBoxTests.cpp
index 92b3df9..606abfb 100644
--- a/loolwsd/test/WhiteBoxTests.cpp
+++ b/loolwsd/test/WhiteBoxTests.cpp
@@ -68,7 +68,6 @@ void WhiteBoxTests::testRegexListMatcher()
     CPPUNIT_ASSERT(matcher.match("10.10.250.254"));
 }
 
-
 void WhiteBoxTests::testRegexListMatcher_Init()
 {
     Util::RegexListMatcher matcher({"localhost", "192\\..*"}, 
{"192\\.168\\..*"});
diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp
index 0da3049..b1e6c5e 100644
--- a/loolwsd/test/httpwstest.cpp
+++ b/loolwsd/test/httpwstest.cpp
@@ -56,9 +56,6 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture
 
     CPPUNIT_TEST_SUITE(HTTPWSTest);
 
-    // This should be the first test:
-    CPPUNIT_TEST(testCountHowManyLoolkits);
-
     CPPUNIT_TEST(testBadRequest);
     CPPUNIT_TEST(testHandShake);
     CPPUNIT_TEST(testCloseAfterClose);
@@ -79,9 +76,6 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture
     CPPUNIT_TEST(testEditLock);
     CPPUNIT_TEST(testSlideShow);
 
-    // This should be the last test:
-    CPPUNIT_TEST(testNoExtraLoolKitsLeft);
-
     CPPUNIT_TEST_SUITE_END();
 
     void testCountHowManyLoolkits();
@@ -134,6 +128,7 @@ public:
 
     void setUp()
     {
+        testCountHowManyLoolkits();
     }
 
     void tearDown()
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
https://lists.freedesktop.org/mailman/listinfo/libreoffice-commits