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

[Ashod Nakashian]

 loolwsd/test/httpcrashtest.cpp           |   13 +++++++------
 loolwsd/test/httpwstest.cpp              |   13 ++++++-------
 loolwsd/test/integration-http-server.cpp |   28 ++++++++++++++++------------
 3 files changed, 29 insertions(+), 25 deletions(-)

New commits:
commit 2726797cb79d4735a017cdb6a566d8feea5153a1
Author: Ashod Nakashian <ashod.nakashian at collabora.co.uk>
Date:   Fri May 13 12:43:43 2016 -0400

    loolwsd: improved loolkit process count tests
    
    Test for kit process counts are ran before and
    after each unit-test.
    
    We expect 1 instance, not 0.
    
    Renamed to follow static member rules.
    
    Change-Id: Ibc1eabf10ffdb75ccaabbc9faff895b7fcc48c48
    Reviewed-on: https://gerrit.libreoffice.org/24988
    Reviewed-by: Ashod Nakashian <ashnakash at gmail.com>
    Tested-by: Ashod Nakashian <ashnakash at gmail.com>

diff --git a/loolwsd/test/httpcrashtest.cpp b/loolwsd/test/httpcrashtest.cpp
index 0ead7ee..ade468d 100644
--- a/loolwsd/test/httpcrashtest.cpp
+++ b/loolwsd/test/httpcrashtest.cpp
@@ -52,7 +52,7 @@ class HTTPCrashTest : public CPPUNIT_NS::TestFixture
 {
     const Poco::URI _uri;
     Poco::Net::HTTPResponse _response;
-    static int _initialLoolKitCount;
+    static int InitialLoolKitCount;
 
     CPPUNIT_TEST_SUITE(HTTPCrashTest);
 
@@ -101,19 +101,19 @@ public:
     }
 };
 
-int HTTPCrashTest::_initialLoolKitCount = 0;
+int HTTPCrashTest::InitialLoolKitCount = 1;
 
 void HTTPCrashTest::testCountHowManyLoolkits()
 {
-    _initialLoolKitCount = countLoolKitProcesses(1);
-    CPPUNIT_ASSERT(_initialLoolKitCount > 0);
+    InitialLoolKitCount = countLoolKitProcesses(InitialLoolKitCount);
+    CPPUNIT_ASSERT(InitialLoolKitCount > 0);
 }
 
 void HTTPCrashTest::testNoExtraLoolKitsLeft()
 {
-    const auto countNow = countLoolKitProcesses(_initialLoolKitCount);
+    const auto countNow = countLoolKitProcesses(InitialLoolKitCount);
 
-    CPPUNIT_ASSERT_EQUAL(_initialLoolKitCount, countNow);
+    CPPUNIT_ASSERT_EQUAL(InitialLoolKitCount, countNow);
 }
 
 void HTTPCrashTest::testBarren()
@@ -122,6 +122,7 @@ void HTTPCrashTest::testBarren()
     try
     {
         killLoKitProcesses();
+        InitialLoolKitCount = countLoolKitProcesses(0);
 
         std::cerr << "Loading after kill." << std::endl;
 
diff --git a/loolwsd/test/httpwstest.cpp b/loolwsd/test/httpwstest.cpp
index 6c9a658..c5418cb 100644
--- a/loolwsd/test/httpwstest.cpp
+++ b/loolwsd/test/httpwstest.cpp
@@ -52,7 +52,7 @@ class HTTPWSTest : public CPPUNIT_NS::TestFixture
 {
     const Poco::URI _uri;
     Poco::Net::HTTPResponse _response;
-    static int _initialLoolKitCount;
+    static int InitialLoolKitCount;
 
     CPPUNIT_TEST_SUITE(HTTPWSTest);
 
@@ -162,12 +162,12 @@ public:
     }
 };
 
-int HTTPWSTest::_initialLoolKitCount = 0;
+int HTTPWSTest::InitialLoolKitCount = 1;
 
 void HTTPWSTest::testCountHowManyLoolkits()
 {
-    _initialLoolKitCount = countLoolKitProcesses(1);
-    CPPUNIT_ASSERT(_initialLoolKitCount > 0);
+    InitialLoolKitCount = countLoolKitProcesses(InitialLoolKitCount);
+    CPPUNIT_ASSERT(InitialLoolKitCount > 0);
 }
 
 void HTTPWSTest::testBadRequest()
@@ -1323,9 +1323,8 @@ void HTTPWSTest::testMaxRow()
 
 void HTTPWSTest::testNoExtraLoolKitsLeft()
 {
-    const auto countNow = countLoolKitProcesses(_initialLoolKitCount);
-
-    CPPUNIT_ASSERT_EQUAL(_initialLoolKitCount, countNow);
+    const auto countNow = countLoolKitProcesses(InitialLoolKitCount);
+    CPPUNIT_ASSERT_EQUAL(InitialLoolKitCount, countNow);
 }
 
 void HTTPWSTest::getPartHashCodes(const std::string status,
diff --git a/loolwsd/test/integration-http-server.cpp b/loolwsd/test/integration-http-server.cpp
index 09482e1..6bec44c 100644
--- a/loolwsd/test/integration-http-server.cpp
+++ b/loolwsd/test/integration-http-server.cpp
@@ -33,22 +33,16 @@
 class HTTPServerTest : public CPPUNIT_NS::TestFixture
 {
     const Poco::URI _uri;
-    static int _initialLoolKitCount;
+    static int InitialLoolKitCount;
 
     CPPUNIT_TEST_SUITE(HTTPServerTest);
 
-    // This should be the first test:
-    CPPUNIT_TEST(testCountHowManyLoolkits);
-
     CPPUNIT_TEST(testDiscovery);
     CPPUNIT_TEST(testLoleafletGet);
     CPPUNIT_TEST(testLoleafletPost);
     CPPUNIT_TEST(testScriptsAndLinksGet);
     CPPUNIT_TEST(testScriptsAndLinksPost);
 
-    // This should be the last test:
-    CPPUNIT_TEST(testNoExtraLoolKitsLeft);
-
     CPPUNIT_TEST_SUITE_END();
 
     void testCountHowManyLoolkits();
@@ -81,14 +75,24 @@ public:
         Poco::Net::uninitializeSSL();
 #endif
     }
+
+    void setUp()
+    {
+        testCountHowManyLoolkits();
+    }
+
+    void tearDown()
+    {
+        testNoExtraLoolKitsLeft();
+    }
 };
 
-int HTTPServerTest::_initialLoolKitCount = 0;
+int HTTPServerTest::InitialLoolKitCount = 1;
 
 void HTTPServerTest::testCountHowManyLoolkits()
 {
-    _initialLoolKitCount = countLoolKitProcesses(1);
-    CPPUNIT_ASSERT(_initialLoolKitCount > 0);
+    InitialLoolKitCount = countLoolKitProcesses(InitialLoolKitCount);
+    CPPUNIT_ASSERT(InitialLoolKitCount > 0);
 }
 
 void HTTPServerTest::testDiscovery()
@@ -233,9 +237,9 @@ void HTTPServerTest::testScriptsAndLinksPost()
 
 void HTTPServerTest::testNoExtraLoolKitsLeft()
 {
-    const auto countNow = countLoolKitProcesses(_initialLoolKitCount);
+    const auto countNow = countLoolKitProcesses(InitialLoolKitCount);
 
-    CPPUNIT_ASSERT_EQUAL(_initialLoolKitCount, countNow);
+    CPPUNIT_ASSERT_EQUAL(InitialLoolKitCount, countNow);
 }
 
 CPPUNIT_TEST_SUITE_REGISTRATION(HTTPServerTest);