Merge lp:~dobey/unity-scope-click/faster-tests into lp:unity-scope-click/devel

[dobey]

Move the slow departments db concurrency test to the integration suite.
Move the existing integration suite under libclickscope as it's for that code.

[PS Jenkins bot (ps-jenkins)]

PASSED: Continuous integration, rev:351
http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-ci/232/
Executed test runs:
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-amd64-ci/207
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/206
        deb: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-armhf-ci/206/artifact/work/output/*zip*/output.zip
    SUCCESS: http://jenkins.qa.ubuntu.com/job/unity-team-unity-scope-click-devel-utopic-i386-ci/206

Click here to trigger a rebuild:
http://s-jenkins.ubuntu-ci:8080/job/unity-team-unity-scope-click-devel-ci/232/rebuild

review: Approve (continuous-integration)

[Alejandro J. Cura (alecu)]

Better, faster, stronger!

review: Approve

=== modified file 'libclickscope/tests/CMakeLists.txt'
--- libclickscope/tests/CMakeLists.txt	2014-07-14 08:49:19 +0000
+++ libclickscope/tests/CMakeLists.txt	2014-07-22 17:17:20 +0000
@@ -70,3 +70,6 @@
   COMMAND valgrind --tool=memcheck --track-origins=yes --num-callers=40 --leak-resolution=high --leak-check=full ${CMAKE_CURRENT_BINARY_DIR}/${LIBCLICKSCOPE_TESTS_TARGET}
   DEPENDS ${LIBCLICKSCOPE_TESTS_TARGET}
 )
+
+
+add_subdirectory(integration)
 
=== renamed directory 'scope/tests/integration' => 'libclickscope/tests/integration'
=== modified file 'libclickscope/tests/integration/CMakeLists.txt'
--- scope/tests/integration/CMakeLists.txt	2014-05-26 15:56:40 +0000
+++ libclickscope/tests/integration/CMakeLists.txt	2014-07-22 17:17:20 +0000
@@ -11,6 +11,7 @@
 FILE (GLOB TEST_HEADERS *.h)
 
 add_executable (${INTEGRATION_TARGET}
+  departmentsdb_integration.cpp
   webclient_integration.cpp
 )
 
 
=== added file 'libclickscope/tests/integration/departmentsdb_integration.cpp'
--- libclickscope/tests/integration/departmentsdb_integration.cpp	1970-01-01 00:00:00 +0000
+++ libclickscope/tests/integration/departmentsdb_integration.cpp	2014-07-22 17:17:20 +0000
@@ -0,0 +1,137 @@
+/*
+ * Copyright (C) 2014 Canonical Ltd.
+ *
+ * This program is free software: you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 3, as published
+ * by the Free Software Foundation.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranties of
+ * MERCHANTABILITY, SATISFACTORY QUALITY, or FITNESS FOR A PARTICULAR
+ * PURPOSE.  See the GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program.  If not, see <http://www.gnu.org/licenses/>.
+ *
+ * In addition, as a special exception, the copyright holders give
+ * permission to link the code of portions of this program with the
+ * OpenSSL library under certain conditions as described in each
+ * individual source file, and distribute linked combinations
+ * including the two.
+ * You must obey the GNU General Public License in all respects
+ * for all of the code used other than OpenSSL.  If you modify
+ * file(s) with this exception, you may extend this exception to your
+ * version of the file(s), but you are not obligated to do so.  If you
+ * do not wish to do so, delete this exception statement from your
+ * version.  If you delete this exception statement from all source
+ * files in the program, then also delete it here.
+ */
+
+#include <gtest/gtest.h>
+
+#include <click/departments-db.h>
+
+#include <memory>
+#include <algorithm>
+#include <unistd.h>
+
+using namespace click;
+
+
+class DepartmentsDbConcurrencyTest: public ::testing::Test
+{
+public:
+    const std::string db_path = TEST_DIR "/departments-db-test2.sqlite";
+
+    void TearDown() override
+    {
+        unlink(db_path.c_str());
+    }
+};
+
+// Keep the numbers below at a reasonable level; it takes around 20 seconds
+// to run this test on a i7-2620M with the default values.
+const int NUM_OF_WRITE_OPS = 50;
+const int NUM_OF_READ_OPS = 100;
+
+void populate_departments(DepartmentsDb *db, int repeat_count)
+{
+    click::DepartmentList depts;
+    // generate departments with one subdepartment
+    for (int i = 0; i < 20; i++)
+    {
+        auto const id = std::to_string(i);
+        auto parent = std::make_shared<click::Department>(id, "Department " + id, "href", true);
+        parent->set_subdepartments({std::make_shared<click::Department>(id + "sub", "Subdepartment of " + id, "href", false)});
+        depts.push_back(parent);
+    }
+
+    for (int i = 0; i < repeat_count; i++)
+    {
+        ASSERT_NO_THROW(db->store_departments(depts, ""));
+
+        // generate apps
+        for (int j = 0; j < 50; j++)
+        {
+            auto const id = std::to_string(j);
+            ASSERT_NO_THROW(db->store_package_mapping("app" + id, id));
+        }
+    }
+}
+
+TEST_F(DepartmentsDbConcurrencyTest, ConcurrentReadWrite)
+{
+    // populate the db initially to make sure reader doesn't fail if it's faster than writer
+    {
+        DepartmentsDb db(db_path, true);
+        populate_departments(&db, 1);
+    }
+
+    pid_t writer_pid = fork();
+    if (writer_pid < 0)
+    {
+        FAIL();
+    }
+    else if (writer_pid == 0) // writer child process
+    {
+        SCOPED_TRACE("writer");
+        std::unique_ptr<DepartmentsDb> db;
+        ASSERT_NO_THROW(db.reset(new DepartmentsDb(db_path, true)));
+
+        populate_departments(db.get(), NUM_OF_WRITE_OPS);
+
+        exit(0);
+    }
+    else // parent process
+    {
+        pid_t reader_pid = fork();
+        if (reader_pid < 0)
+        {
+            FAIL();
+        }
+        else if (reader_pid == 0) // reader child process
+        {
+            SCOPED_TRACE("reader");
+            std::unique_ptr<DepartmentsDb> db;
+            ASSERT_NO_THROW(db.reset(new DepartmentsDb(db_path, false)));
+
+            for (int i = 0; i < NUM_OF_READ_OPS; i++)
+            {
+                ASSERT_NO_THROW(db->get_department_name("1", {""}));
+                ASSERT_NO_THROW(db->get_parent_department_id("1"));
+                ASSERT_NO_THROW(db->get_packages_for_department("1", false));
+                ASSERT_NO_THROW(db->get_packages_for_department("1", true));
+                ASSERT_NO_THROW(db->get_children_departments(""));
+                ASSERT_NO_THROW(db->department_name_count());
+                ASSERT_NO_THROW(db->department_mapping_count());
+                ASSERT_NO_THROW(db->package_count());
+            }
+            exit(0);
+        }
+        else // parent process
+        {
+            wait(nullptr);
+            wait(nullptr);
+        }
+    }
+}
 
=== modified file 'libclickscope/tests/test_departments-db.cpp'
--- libclickscope/tests/test_departments-db.cpp	2014-07-18 15:10:55 +0000
+++ libclickscope/tests/test_departments-db.cpp	2014-07-22 17:17:20 +0000
@@ -32,7 +32,6 @@
 #include <click/departments-db.h>
 #include <memory>
 #include <algorithm>
-#include <unistd.h>
 
 using namespace click;
 
@@ -94,16 +93,6 @@
     std::unique_ptr<DepartmentsDbCheck> db;
 };
 
-class DepartmentsDbConcurrencyTest: public ::testing::Test
-{
-public:
-    const std::string db_path = TEST_DIR "/departments-db-test2.sqlite";
-
-    void TearDown() override
-    {
-        unlink(db_path.c_str());
-    }
-};
 
 TEST_F(DepartmentsDbTest, testDepartmentNameLookup)
 {
@@ -290,93 +279,6 @@
     db->check_sql_queries_finished();
 }
 
-// Keep the numbers below at a reasonable level; it takes around 20 seconds
-// to run this test on a i7-2620M with the default values.
-const int NUM_OF_WRITE_OPS = 50;
-const int NUM_OF_READ_OPS = 100;
-
-void populate_departments(DepartmentsDb *db, int repeat_count)
-{
-    click::DepartmentList depts;
-    // generate departments with one subdepartment
-    for (int i = 0; i < 20; i++)
-    {
-        auto const id = std::to_string(i);
-        auto parent = std::make_shared<click::Department>(id, "Department " + id, "href", true);
-        parent->set_subdepartments({std::make_shared<click::Department>(id + "sub", "Subdepartment of " + id, "href", false)});
-        depts.push_back(parent);
-    }
-
-    for (int i = 0; i < repeat_count; i++)
-    {
-        ASSERT_NO_THROW(db->store_departments(depts, ""));
-
-        // generate apps
-        for (int j = 0; j < 50; j++)
-        {
-            auto const id = std::to_string(j);
-            ASSERT_NO_THROW(db->store_package_mapping("app" + id, id));
-        }
-    }
-}
-
-TEST_F(DepartmentsDbConcurrencyTest, ConcurrentReadWrite)
-{
-    // populate the db initially to make sure reader doesn't fail if it's faster than writer
-    {
-        DepartmentsDb db(db_path, true);
-        populate_departments(&db, 1);
-    }
-
-    pid_t writer_pid = fork();
-    if (writer_pid < 0)
-    {
-        FAIL();
-    }
-    else if (writer_pid == 0) // writer child process
-    {
-        SCOPED_TRACE("writer");
-        std::unique_ptr<DepartmentsDb> db;
-        ASSERT_NO_THROW(db.reset(new DepartmentsDb(db_path, true)));
-
-        populate_departments(db.get(), NUM_OF_WRITE_OPS);
-
-        exit(0);
-    }
-    else // parent process
-    {
-        pid_t reader_pid = fork();
-        if (reader_pid < 0)
-        {
-            FAIL();
-        }
-        else if (reader_pid == 0) // reader child process
-        {
-            SCOPED_TRACE("reader");
-            std::unique_ptr<DepartmentsDb> db;
-            ASSERT_NO_THROW(db.reset(new DepartmentsDb(db_path, false)));
-
-            for (int i = 0; i < NUM_OF_READ_OPS; i++)
-            {
-                ASSERT_NO_THROW(db->get_department_name("1", {""}));
-                ASSERT_NO_THROW(db->get_parent_department_id("1"));
-                ASSERT_NO_THROW(db->get_packages_for_department("1", false));
-                ASSERT_NO_THROW(db->get_packages_for_department("1", true));
-                ASSERT_NO_THROW(db->get_children_departments(""));
-                ASSERT_NO_THROW(db->department_name_count());
-                ASSERT_NO_THROW(db->department_mapping_count());
-                ASSERT_NO_THROW(db->package_count());
-            }
-            exit(0);
-        }
-        else // parent process
-        {
-            wait(nullptr);
-            wait(nullptr);
-        }
-    }
-}
-
 TEST(DepartmentsDb, testOpenFailsOnUnitializedDb)
 {
     ASSERT_THROW(
 
=== modified file 'scope/tests/CMakeLists.txt'
--- scope/tests/CMakeLists.txt	2014-07-17 16:20:24 +0000
+++ scope/tests/CMakeLists.txt	2014-07-22 17:17:20 +0000
@@ -102,7 +102,6 @@
 )
 
 
-add_subdirectory(integration)
 add_subdirectory(download_manager_tool)
 add_subdirectory(click_interface_tool)
 add_subdirectory(fake_launcher)