Reorganize tests in security-containers 33/22133/3
authorLukasz Kostyra <l.kostyra@samsung.com>
Thu, 29 May 2014 08:42:20 +0000 (10:42 +0200)
committerLukasz Kostyra <l.kostyra@samsung.com>
Thu, 29 May 2014 12:39:55 +0000 (14:39 +0200)
[Feature]       Reorganization of tests in security-containers
[Cause]         Integration tests will be added to security-containers. In order to keep repo clean
                all tests should be gathered in a "tests" directory and there divided into
                test categories.
[Solution]      Created "tests" directory and moved "unit_tests" to "tests" dir. Modified
                CMakeLists to make project buildable. Changed RPM name from ...-unit-tests to
                ...-tests
[Verification]  Build, install, run tests. All tests should work as they did before this commit.

Change-Id: I6d6e89f913fa5e7eece8a8502472ac499bc71117
Signed-off-by: Lukasz Kostyra <l.kostyra@samsung.com>
68 files changed:
CMakeLists.txt
packaging/security-containers-server-tests.manifest [moved from packaging/security-containers-server-unit-tests.manifest with 100% similarity]
packaging/security-containers.spec
tests/CMakeLists.txt [new file with mode: 0644]
tests/scripts/CMakeLists.txt [moved from unit_tests/scripts/CMakeLists.txt with 100% similarity]
tests/scripts/sc_all_tests.py [moved from unit_tests/scripts/sc_all_tests.py with 100% similarity]
tests/scripts/sc_launch_test.py [moved from unit_tests/scripts/sc_launch_test.py with 100% similarity]
tests/scripts/sc_test_parser.py [moved from unit_tests/scripts/sc_test_parser.py with 100% similarity]
tests/unit_tests/CMakeLists.txt [moved from unit_tests/CMakeLists.txt with 98% similarity]
tests/unit_tests/config/ut-configuration.cpp [moved from unit_tests/config/ut-configuration.cpp with 100% similarity]
tests/unit_tests/dbus/configs/CMakeLists.txt [moved from unit_tests/dbus/configs/CMakeLists.txt with 100% similarity]
tests/unit_tests/dbus/configs/ut-connection/ut-dbus.conf [moved from unit_tests/dbus/configs/ut-connection/ut-dbus.conf with 100% similarity]
tests/unit_tests/dbus/test-client.cpp [moved from unit_tests/dbus/test-client.cpp with 100% similarity]
tests/unit_tests/dbus/test-client.hpp [moved from unit_tests/dbus/test-client.hpp with 100% similarity]
tests/unit_tests/dbus/test-common.hpp [moved from unit_tests/dbus/test-common.hpp with 100% similarity]
tests/unit_tests/dbus/test-server.cpp [moved from unit_tests/dbus/test-server.cpp with 100% similarity]
tests/unit_tests/dbus/test-server.hpp [moved from unit_tests/dbus/test-server.hpp with 100% similarity]
tests/unit_tests/dbus/ut-connection.cpp [moved from unit_tests/dbus/ut-connection.cpp with 100% similarity]
tests/unit_tests/libvirt/connection.cpp [moved from unit_tests/libvirt/connection.cpp with 100% similarity]
tests/unit_tests/libvirt/domain.cpp [moved from unit_tests/libvirt/domain.cpp with 100% similarity]
tests/unit_tests/log/ut-logger.cpp [moved from unit_tests/log/ut-logger.cpp with 100% similarity]
tests/unit_tests/server/configs/CMakeLists.txt [moved from unit_tests/server/configs/CMakeLists.txt with 100% similarity]
tests/unit_tests/server/configs/ut-container-admin/containers/buggy.conf.in [moved from unit_tests/server/configs/ut-container-admin/containers/buggy.conf.in with 100% similarity]
tests/unit_tests/server/configs/ut-container-admin/containers/missing.conf [moved from unit_tests/server/configs/ut-container-admin/containers/missing.conf with 100% similarity]
tests/unit_tests/server/configs/ut-container-admin/containers/test-no-shutdown.conf.in [moved from unit_tests/server/configs/ut-container-admin/containers/test-no-shutdown.conf.in with 100% similarity]
tests/unit_tests/server/configs/ut-container-admin/containers/test.conf.in [moved from unit_tests/server/configs/ut-container-admin/containers/test.conf.in with 100% similarity]
tests/unit_tests/server/configs/ut-container-admin/libvirt-config/buggy.xml [moved from unit_tests/server/configs/ut-container-admin/libvirt-config/buggy.xml with 100% similarity]
tests/unit_tests/server/configs/ut-container-admin/libvirt-config/test-no-shutdown.xml [moved from unit_tests/server/configs/ut-container-admin/libvirt-config/test-no-shutdown.xml with 100% similarity]
tests/unit_tests/server/configs/ut-container-admin/libvirt-config/test.xml [moved from unit_tests/server/configs/ut-container-admin/libvirt-config/test.xml with 100% similarity]
tests/unit_tests/server/configs/ut-container-connection/ut-dbus.conf [moved from unit_tests/server/configs/ut-container-connection/ut-dbus.conf with 100% similarity]
tests/unit_tests/server/configs/ut-container/containers/buggy.conf [moved from unit_tests/server/configs/ut-container/containers/buggy.conf with 100% similarity]
tests/unit_tests/server/configs/ut-container/containers/test-dbus.conf [moved from unit_tests/server/configs/ut-container/containers/test-dbus.conf with 100% similarity]
tests/unit_tests/server/configs/ut-container/containers/test.conf [moved from unit_tests/server/configs/ut-container/containers/test.conf with 100% similarity]
tests/unit_tests/server/configs/ut-container/libvirt-config/test-dbus.xml.in [moved from unit_tests/server/configs/ut-container/libvirt-config/test-dbus.xml.in with 100% similarity]
tests/unit_tests/server/configs/ut-container/libvirt-config/test.xml [moved from unit_tests/server/configs/ut-container/libvirt-config/test.xml with 100% similarity]
tests/unit_tests/server/configs/ut-container/ut-dbus.conf [moved from unit_tests/server/configs/ut-container/ut-dbus.conf with 100% similarity]
tests/unit_tests/server/configs/ut-containers-manager/buggy-daemon.conf [moved from unit_tests/server/configs/ut-containers-manager/buggy-daemon.conf with 100% similarity]
tests/unit_tests/server/configs/ut-containers-manager/buggy-foreground-daemon.conf [moved from unit_tests/server/configs/ut-containers-manager/buggy-foreground-daemon.conf with 100% similarity]
tests/unit_tests/server/configs/ut-containers-manager/containers/console1.conf [moved from unit_tests/server/configs/ut-containers-manager/containers/console1.conf with 100% similarity]
tests/unit_tests/server/configs/ut-containers-manager/containers/console2.conf [moved from unit_tests/server/configs/ut-containers-manager/containers/console2.conf with 100% similarity]
tests/unit_tests/server/configs/ut-containers-manager/containers/console3.conf [moved from unit_tests/server/configs/ut-containers-manager/containers/console3.conf with 100% similarity]
tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console1.xml [moved from unit_tests/server/configs/ut-containers-manager/libvirt-config/console1.xml with 100% similarity]
tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console2.xml [moved from unit_tests/server/configs/ut-containers-manager/libvirt-config/console2.xml with 100% similarity]
tests/unit_tests/server/configs/ut-containers-manager/libvirt-config/console3.xml [moved from unit_tests/server/configs/ut-containers-manager/libvirt-config/console3.xml with 100% similarity]
tests/unit_tests/server/configs/ut-containers-manager/test-daemon.conf [moved from unit_tests/server/configs/ut-containers-manager/test-daemon.conf with 100% similarity]
tests/unit_tests/server/configs/ut-server/buggy-daemon.conf [moved from unit_tests/server/configs/ut-server/buggy-daemon.conf with 100% similarity]
tests/unit_tests/server/configs/ut-server/containers/container1.conf [moved from unit_tests/server/configs/ut-server/containers/container1.conf with 100% similarity]
tests/unit_tests/server/configs/ut-server/containers/container2.conf [moved from unit_tests/server/configs/ut-server/containers/container2.conf with 100% similarity]
tests/unit_tests/server/configs/ut-server/containers/container3.conf [moved from unit_tests/server/configs/ut-server/containers/container3.conf with 100% similarity]
tests/unit_tests/server/configs/ut-server/libvirt-config/container1.xml [moved from unit_tests/server/configs/ut-server/libvirt-config/container1.xml with 100% similarity]
tests/unit_tests/server/configs/ut-server/libvirt-config/container2.xml [moved from unit_tests/server/configs/ut-server/libvirt-config/container2.xml with 100% similarity]
tests/unit_tests/server/configs/ut-server/libvirt-config/container3.xml [moved from unit_tests/server/configs/ut-server/libvirt-config/container3.xml with 100% similarity]
tests/unit_tests/server/configs/ut-server/test-daemon.conf [moved from unit_tests/server/configs/ut-server/test-daemon.conf with 100% similarity]
tests/unit_tests/server/ut-container-admin.cpp [moved from unit_tests/server/ut-container-admin.cpp with 100% similarity]
tests/unit_tests/server/ut-container-connection.cpp [moved from unit_tests/server/ut-container-connection.cpp with 100% similarity]
tests/unit_tests/server/ut-container.cpp [moved from unit_tests/server/ut-container.cpp with 100% similarity]
tests/unit_tests/server/ut-containers-manager.cpp [moved from unit_tests/server/ut-containers-manager.cpp with 100% similarity]
tests/unit_tests/server/ut-server.cpp [moved from unit_tests/server/ut-server.cpp with 100% similarity]
tests/unit_tests/ut.cpp [moved from unit_tests/ut.cpp with 100% similarity]
tests/unit_tests/ut.hpp [moved from unit_tests/ut.hpp with 100% similarity]
tests/unit_tests/utils/configs/CMakeLists.txt [moved from unit_tests/utils/configs/CMakeLists.txt with 100% similarity]
tests/unit_tests/utils/configs/ut-fs/file.txt [moved from unit_tests/utils/configs/ut-fs/file.txt with 100% similarity]
tests/unit_tests/utils/scoped-daemon.cpp [moved from unit_tests/utils/scoped-daemon.cpp with 100% similarity]
tests/unit_tests/utils/scoped-daemon.hpp [moved from unit_tests/utils/scoped-daemon.hpp with 100% similarity]
tests/unit_tests/utils/ut-callback-guard.cpp [moved from unit_tests/utils/ut-callback-guard.cpp with 100% similarity]
tests/unit_tests/utils/ut-fs.cpp [moved from unit_tests/utils/ut-fs.cpp with 100% similarity]
tests/unit_tests/utils/ut-glib-loop.cpp [moved from unit_tests/utils/ut-glib-loop.cpp with 100% similarity]
tests/unit_tests/utils/ut-paths.cpp [moved from unit_tests/utils/ut-paths.cpp with 100% similarity]

index 88a1eaf..8c987dd 100644 (file)
@@ -1,4 +1,4 @@
-# Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
+#Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
 #
 #    Licensed under the Apache License, Version 2.0 (the "License");
 #    you may not use this file except in compliance with the License.
@@ -59,7 +59,8 @@ SET(COMMON_FOLDER ${PROJECT_SOURCE_DIR}/common)
 SET(CLIENT_FOLDER ${PROJECT_SOURCE_DIR}/client)
 SET(SERVER_FOLDER ${PROJECT_SOURCE_DIR}/server)
 SET(CONTAINER_DAEMON_FOLDER ${PROJECT_SOURCE_DIR}/container-daemon)
-SET(UNIT_TESTS_FOLDER ${PROJECT_SOURCE_DIR}/unit_tests)
+SET(TESTS_FOLDER ${PROJECT_SOURCE_DIR}/tests)
+SET(UNIT_TESTS_FOLDER ${TESTS_FOLDER}/unit_tests)
 
 IF(NOT DEFINED SYSCONF_INSTALL_DIR)
     SET(SYSCONF_INSTALL_DIR "/etc")
@@ -91,5 +92,5 @@ SET(SC_DATA_INSTALL_DIR ${SHARE_INSTALL_PREFIX}/security-containers)
 ADD_SUBDIRECTORY(${CLIENT_FOLDER})
 ADD_SUBDIRECTORY(${SERVER_FOLDER})
 ADD_SUBDIRECTORY(${CONTAINER_DAEMON_FOLDER})
-ADD_SUBDIRECTORY(${UNIT_TESTS_FOLDER})
+ADD_SUBDIRECTORY(${TESTS_FOLDER})
 
index 23b7bb3..b6c7e78 100644 (file)
@@ -136,8 +136,8 @@ Daemon running inside every container.
 
 
 ## Test Package ################################################################
-%package unit-tests
-Summary:          Security Containers Unit Tests
+%package tests
+Summary:          Security Containers Tests
 Group:            Development/Libraries
 Requires:         security-containers = %{version}-%{release}
 Requires:         security-containers-client = %{version}-%{release}
@@ -145,11 +145,11 @@ Requires:         python
 Requires:         boost-test
 BuildRequires:    boost-devel
 
-%description unit-tests
-Unit tests for both: server and client.
+%description tests
+Unit tests for both: server and client and integration tests.
 
-%files unit-tests
-%manifest packaging/security-containers-server-unit-tests.manifest
+%files tests
+%manifest packaging/security-containers-server-tests.manifest
 %defattr(644,root,root,755)
 %attr(755,root,root) %{_bindir}/security-containers-server-unit-tests
 %attr(755,root,root) %{script_dir}/sc_all_tests.py
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
new file mode 100644 (file)
index 0000000..54dd155
--- /dev/null
@@ -0,0 +1,22 @@
+#Copyright (c) 2014 Samsung Electronics Co., Ltd All Rights Reserved
+#
+#    Licensed under the Apache License, Version 2.0 (the "License");
+#    you may not use this file except in compliance with the License.
+#    You may obtain a copy of the License at
+#
+#        http://www.apache.org/licenses/LICENSE-2.0
+#
+#    Unless required by applicable law or agreed to in writing, software
+#    distributed under the License is distributed on an "AS IS" BASIS,
+#    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#    See the License for the specific language governing permissions and
+#    limitations under the License.
+#
+#
+# @file   CMakeLists.txt
+# @author Lukasz Kostyra (l.kostyra@samsung.com)
+#
+
+ADD_SUBDIRECTORY(scripts)
+ADD_SUBDIRECTORY(unit_tests)
+
similarity index 98%
rename from unit_tests/CMakeLists.txt
rename to tests/unit_tests/CMakeLists.txt
index e865049..51d9fd1 100644 (file)
@@ -44,7 +44,6 @@ TARGET_LINK_LIBRARIES(${UT_SERVER_CODENAME} ${UT_SERVER_DEPS_LIBRARIES} ${Boost_
 SET(SC_TEST_CONFIG_INSTALL_DIR ${SC_DATA_INSTALL_DIR}/tests)
 ADD_DEFINITIONS(-DSC_TEST_CONFIG_INSTALL_DIR="${SC_TEST_CONFIG_INSTALL_DIR}")
 
-ADD_SUBDIRECTORY(scripts)
 ADD_SUBDIRECTORY(dbus/configs)
 ADD_SUBDIRECTORY(server/configs)
 ADD_SUBDIRECTORY(utils/configs)
similarity index 100%
rename from unit_tests/ut.cpp
rename to tests/unit_tests/ut.cpp
similarity index 100%
rename from unit_tests/ut.hpp
rename to tests/unit_tests/ut.hpp