Renaming tests binaries

[Issue#]        LINUXWRT-130
[Problem]       Tests binaries should be named <reponame>-tests-<name>
[Cause]         N/A
[Solution]      N/A
[Verification]  Build wrt-installer repository

Change-Id: Id2be8379b7f034e3f62b91b6c6456b78fbe6412c

diff --git a/packaging/wrt-installer.spec b/packaging/wrt-installer.spec
index e0c73a7..e679d68 100644 (file)
--- a/packaging/wrt-installer.spec
+++ b/packaging/wrt-installer.spec
@@ -112,5 +112,5 @@ mkdir -p /opt/share/icons/default/small
 %{_libdir}/systemd/user/tizen-mobile-session.target.wants/wrt-preinstall-widgets.service
 %{_libdir}/systemd/user/wrt-preinstall-widgets.service
 %if %{with_tests}
-    %attr(755,root,root) %{_bindir}/wrt-tests-installer
+    %attr(755,root,root) %{_bindir}/wrt-installer-tests-*
 %endif

diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 26b57d4..5951524 100644 (file)
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -17,4 +17,4 @@
 #
 
 
-ADD_SUBDIRECTORY(system_tests)
+ADD_SUBDIRECTORY(general)

diff --git a/tests/system_tests/CMakeLists.txt b/tests/general/CMakeLists.txt
similarity index 87%
rename from tests/system_tests/CMakeLists.txt
rename to tests/general/CMakeLists.txt
index e1d551b..e72a998 100644 (file)
--- a/tests/system_tests/CMakeLists.txt
+++ b/tests/general/CMakeLists.txt
@@ -62,16 +62,16 @@ include_directories(
 
 ADD_SUBDIRECTORY(common)
 
-SET(MISC_TESTS_SOURCES
+SET(INSTALLER_TESTS_SOURCES
     ${CMAKE_CURRENT_SOURCE_DIR}/TestInit.cpp
     ${CMAKE_CURRENT_SOURCE_DIR}/TestCases.cpp
 )
 
-SET(MISC_TESTS_TARGET "wrt-tests-installer")
+SET(INSTALLER_TESTS_TARGET "wrt-installer-tests-general")
 
-WRT_TEST_BUILD(${MISC_TESTS_TARGET} ${MISC_TESTS_SOURCES})
-WRT_TEST_INSTALL(${MISC_TESTS_TARGET})
-target_link_libraries(${MISC_TESTS_TARGET}
+WRT_TEST_BUILD(${INSTALLER_TESTS_TARGET} ${INSTALLER_TESTS_SOURCES})
+WRT_TEST_INSTALL(${INSTALLER_TESTS_TARGET})
+target_link_libraries(${INSTALLER_TESTS_TARGET}
   ${dpl_LIBRARIES}
   ${dpl-test_LIBRARIES}
   ${WRT_TEST_LIBRARY}

diff --git a/tests/system_tests/CMakeUtils.txt b/tests/general/CMakeUtils.txt
similarity index 100%
rename from tests/system_tests/CMakeUtils.txt
rename to tests/general/CMakeUtils.txt

diff --git a/tests/system_tests/TestCases.cpp b/tests/general/TestCases.cpp
similarity index 100%
rename from tests/system_tests/TestCases.cpp
rename to tests/general/TestCases.cpp

diff --git a/tests/system_tests/TestInit.cpp b/tests/general/TestInit.cpp
similarity index 100%
rename from tests/system_tests/TestInit.cpp
rename to tests/general/TestInit.cpp

diff --git a/tests/system_tests/common/CMakeLists.txt b/tests/general/common/CMakeLists.txt
similarity index 100%
rename from tests/system_tests/common/CMakeLists.txt
rename to tests/general/common/CMakeLists.txt

diff --git a/tests/system_tests/common/include/InstallerWrapper.h b/tests/general/common/include/InstallerWrapper.h
similarity index 84%
rename from tests/system_tests/common/include/InstallerWrapper.h
rename to tests/general/common/include/InstallerWrapper.h
index 00369c2..c8f68f8 100644 (file)
--- a/tests/system_tests/common/include/InstallerWrapper.h
+++ b/tests/general/common/include/InstallerWrapper.h
@@ -14,8 +14,8 @@
  *    limitations under the License.
  */
 
-#ifndef WRT_INSTALLER_TESTS_SYSTEM_TESTS_COMMON_INCLUDE_INSTALLER_WRAPPER_H
-#define WRT_INSTALLER_TESTS_SYSTEM_TESTS_COMMON_INCLUDE_INSTALLER_WRAPPER_H
+#ifndef WRT_INSTALLER_TESTS_GENERAL_COMMON_INCLUDE_INSTALLER_WRAPPER_H
+#define WRT_INSTALLER_TESTS_GENERAL_COMMON_INCLUDE_INSTALLER_WRAPPER_H
 
 #include <string>
 
@@ -41,4 +41,4 @@ bool sigintWrtClients();
 
 }
 
-#endif//WRT_INSTALLER_TESTS_SYSTEM_TESTS_COMMON_INCLUDE_INSTALLER_WRAPPER_H
+#endif//WRT_INSTALLER_TESTS_GENERAL_COMMON_INCLUDE_INSTALLER_WRAPPER_H

diff --git a/tests/system_tests/common/include/ManifestFile.h b/tests/general/common/include/ManifestFile.h
similarity index 86%
rename from tests/system_tests/common/include/ManifestFile.h
rename to tests/general/common/include/ManifestFile.h
index a42e70a..3bd67c5 100644 (file)
--- a/tests/system_tests/common/include/ManifestFile.h
+++ b/tests/general/common/include/ManifestFile.h
@@ -19,8 +19,8 @@
  * @brief       Manifest file reading
  */
 
-#ifndef WRT_INSTALLER_TESTS_SYSTEM_TESTS_COMMON_INCLUDE_MANIFESTFILE_H
-#define WRT_INSTALLER_TESTS_SYSTEM_TESTS_COMMON_INCLUDE_MANIFESTFILE_H
+#ifndef WRT_INSTALLER_TESTS_GENERAL_COMMON_INCLUDE_MANIFESTFILE_H
+#define WRT_INSTALLER_TESTS_GENERAL_COMMON_INCLUDE_MANIFESTFILE_H
 
 #include <string>
 
@@ -51,4 +51,4 @@ private:
 };
 
 
-#endif //WRT_INSTALLER_TESTS_SYSTEM_TESTS_COMMON_INCLUDE_MANIFESTFILE_H
+#endif //WRT_INSTALLER_TESTS_GENERAL_COMMON_INCLUDE_MANIFESTFILE_H

diff --git a/tests/system_tests/common/src/InstallerWrapper.cpp b/tests/general/common/src/InstallerWrapper.cpp
similarity index 100%
rename from tests/system_tests/common/src/InstallerWrapper.cpp
rename to tests/general/common/src/InstallerWrapper.cpp

diff --git a/tests/system_tests/common/src/ManifestFile.cpp b/tests/general/common/src/ManifestFile.cpp
similarity index 100%
rename from tests/system_tests/common/src/ManifestFile.cpp
rename to tests/general/common/src/ManifestFile.cpp

diff --git a/tests/system_tests/widgets/bg-00-with_bg.wgt b/tests/general/widgets/bg-00-with_bg.wgt
similarity index 100%
rename from tests/system_tests/widgets/bg-00-with_bg.wgt
rename to tests/general/widgets/bg-00-with_bg.wgt

diff --git a/tests/system_tests/widgets/bg-01-missing_file.wgt b/tests/general/widgets/bg-01-missing_file.wgt
similarity index 100%
rename from tests/system_tests/widgets/bg-01-missing_file.wgt
rename to tests/general/widgets/bg-01-missing_file.wgt

diff --git a/tests/system_tests/widgets/bg-02-without_bg.wgt b/tests/general/widgets/bg-02-without_bg.wgt
similarity index 100%
rename from tests/system_tests/widgets/bg-02-without_bg.wgt
rename to tests/general/widgets/bg-02-without_bg.wgt

diff --git a/tests/system_tests/widgets/content_listener.wgt b/tests/general/widgets/content_listener.wgt
similarity index 100%
rename from tests/system_tests/widgets/content_listener.wgt
rename to tests/general/widgets/content_listener.wgt

diff --git a/tests/system_tests/widgets/content_listener/config.xml b/tests/general/widgets/content_listener/config.xml
similarity index 100%
rename from tests/system_tests/widgets/content_listener/config.xml
rename to tests/general/widgets/content_listener/config.xml

diff --git a/tests/system_tests/widgets/content_listener2/hook.js b/tests/general/widgets/content_listener/hook.js
similarity index 100%
rename from tests/system_tests/widgets/content_listener2/hook.js
rename to tests/general/widgets/content_listener/hook.js

diff --git a/tests/system_tests/widgets/content_listener2/index.html b/tests/general/widgets/content_listener/index.html
similarity index 100%
rename from tests/system_tests/widgets/content_listener2/index.html
rename to tests/general/widgets/content_listener/index.html

diff --git a/tests/system_tests/widgets/content_listener2/test.html b/tests/general/widgets/content_listener/test.html
similarity index 100%
rename from tests/system_tests/widgets/content_listener2/test.html
rename to tests/general/widgets/content_listener/test.html

diff --git a/tests/system_tests/widgets/content_listener2.wgt b/tests/general/widgets/content_listener2.wgt
similarity index 100%
rename from tests/system_tests/widgets/content_listener2.wgt
rename to tests/general/widgets/content_listener2.wgt

diff --git a/tests/system_tests/widgets/content_listener2/config.xml b/tests/general/widgets/content_listener2/config.xml
similarity index 100%
rename from tests/system_tests/widgets/content_listener2/config.xml
rename to tests/general/widgets/content_listener2/config.xml

diff --git a/tests/system_tests/widgets/content_listener/hook.js b/tests/general/widgets/content_listener2/hook.js
similarity index 100%
rename from tests/system_tests/widgets/content_listener/hook.js
rename to tests/general/widgets/content_listener2/hook.js

diff --git a/tests/system_tests/widgets/content_listener/index.html b/tests/general/widgets/content_listener2/index.html
similarity index 100%
rename from tests/system_tests/widgets/content_listener/index.html
rename to tests/general/widgets/content_listener2/index.html

diff --git a/tests/system_tests/widgets/content_listener/test.html b/tests/general/widgets/content_listener2/test.html
similarity index 100%
rename from tests/system_tests/widgets/content_listener/test.html
rename to tests/general/widgets/content_listener2/test.html

diff --git a/tests/system_tests/widgets/inst_nplug_1.wgt b/tests/general/widgets/inst_nplug_1.wgt
similarity index 100%
rename from tests/system_tests/widgets/inst_nplug_1.wgt
rename to tests/general/widgets/inst_nplug_1.wgt

diff --git a/tests/system_tests/widgets/inst_nplug_2.wgt b/tests/general/widgets/inst_nplug_2.wgt
similarity index 100%
rename from tests/system_tests/widgets/inst_nplug_2.wgt
rename to tests/general/widgets/inst_nplug_2.wgt

diff --git a/tests/system_tests/widgets/inst_nplug_3.wgt b/tests/general/widgets/inst_nplug_3.wgt
similarity index 100%
rename from tests/system_tests/widgets/inst_nplug_3.wgt
rename to tests/general/widgets/inst_nplug_3.wgt

diff --git a/tests/system_tests/widgets/inst_nplug_4.wgt b/tests/general/widgets/inst_nplug_4.wgt
similarity index 100%
rename from tests/system_tests/widgets/inst_nplug_4.wgt
rename to tests/general/widgets/inst_nplug_4.wgt

diff --git a/tests/system_tests/widgets/manifest.wgt b/tests/general/widgets/manifest.wgt
similarity index 100%
rename from tests/system_tests/widgets/manifest.wgt
rename to tests/general/widgets/manifest.wgt

diff --git a/tests/system_tests/widgets/minimal.wgt b/tests/general/widgets/minimal.wgt
similarity index 100%
rename from tests/system_tests/widgets/minimal.wgt
rename to tests/general/widgets/minimal.wgt

diff --git a/tests/system_tests/widgets/nonroot.wgt b/tests/general/widgets/nonroot.wgt
similarity index 100%
rename from tests/system_tests/widgets/nonroot.wgt
rename to tests/general/widgets/nonroot.wgt

diff --git a/tests/system_tests/widgets/protocol_listener.wgt b/tests/general/widgets/protocol_listener.wgt
similarity index 100%
rename from tests/system_tests/widgets/protocol_listener.wgt
rename to tests/general/widgets/protocol_listener.wgt

diff --git a/tests/system_tests/widgets/protocol_listener/config.xml b/tests/general/widgets/protocol_listener/config.xml
similarity index 100%
rename from tests/system_tests/widgets/protocol_listener/config.xml
rename to tests/general/widgets/protocol_listener/config.xml

diff --git a/tests/system_tests/widgets/protocol_listener2/hook.js b/tests/general/widgets/protocol_listener/hook.js
similarity index 100%
rename from tests/system_tests/widgets/protocol_listener2/hook.js
rename to tests/general/widgets/protocol_listener/hook.js

diff --git a/tests/system_tests/widgets/protocol_listener2/index.html b/tests/general/widgets/protocol_listener/index.html
similarity index 100%
rename from tests/system_tests/widgets/protocol_listener2/index.html
rename to tests/general/widgets/protocol_listener/index.html

diff --git a/tests/system_tests/widgets/protocol_listener2/news.html b/tests/general/widgets/protocol_listener/news.html
similarity index 100%
rename from tests/system_tests/widgets/protocol_listener2/news.html
rename to tests/general/widgets/protocol_listener/news.html

diff --git a/tests/system_tests/widgets/protocol_listener2.wgt b/tests/general/widgets/protocol_listener2.wgt
similarity index 100%
rename from tests/system_tests/widgets/protocol_listener2.wgt
rename to tests/general/widgets/protocol_listener2.wgt

diff --git a/tests/system_tests/widgets/protocol_listener2/config.xml b/tests/general/widgets/protocol_listener2/config.xml
similarity index 100%
rename from tests/system_tests/widgets/protocol_listener2/config.xml
rename to tests/general/widgets/protocol_listener2/config.xml

diff --git a/tests/system_tests/widgets/protocol_listener/hook.js b/tests/general/widgets/protocol_listener2/hook.js
similarity index 100%
rename from tests/system_tests/widgets/protocol_listener/hook.js
rename to tests/general/widgets/protocol_listener2/hook.js

diff --git a/tests/system_tests/widgets/protocol_listener/index.html b/tests/general/widgets/protocol_listener2/index.html
similarity index 100%
rename from tests/system_tests/widgets/protocol_listener/index.html
rename to tests/general/widgets/protocol_listener2/index.html

diff --git a/tests/system_tests/widgets/protocol_listener/news.html b/tests/general/widgets/protocol_listener2/news.html
similarity index 100%
rename from tests/system_tests/widgets/protocol_listener/news.html
rename to tests/general/widgets/protocol_listener2/news.html

diff --git a/tests/system_tests/widgets/register_content.wgt b/tests/general/widgets/register_content.wgt
similarity index 100%
rename from tests/system_tests/widgets/register_content.wgt
rename to tests/general/widgets/register_content.wgt

diff --git a/tests/system_tests/widgets/register_content/config.xml b/tests/general/widgets/register_content/config.xml
similarity index 100%
rename from tests/system_tests/widgets/register_content/config.xml
rename to tests/general/widgets/register_content/config.xml

diff --git a/tests/system_tests/widgets/register_content/hook.js b/tests/general/widgets/register_content/hook.js
similarity index 100%
rename from tests/system_tests/widgets/register_content/hook.js
rename to tests/general/widgets/register_content/hook.js

diff --git a/tests/system_tests/widgets/register_protocol_fail/index.html b/tests/general/widgets/register_content/index.html
similarity index 100%
rename from tests/system_tests/widgets/register_protocol_fail/index.html
rename to tests/general/widgets/register_content/index.html

diff --git a/tests/system_tests/widgets/register_content_fail.wgt b/tests/general/widgets/register_content_fail.wgt
similarity index 100%
rename from tests/system_tests/widgets/register_content_fail.wgt
rename to tests/general/widgets/register_content_fail.wgt

diff --git a/tests/system_tests/widgets/register_content_fail/config.xml b/tests/general/widgets/register_content_fail/config.xml
similarity index 100%
rename from tests/system_tests/widgets/register_content_fail/config.xml
rename to tests/general/widgets/register_content_fail/config.xml

diff --git a/tests/system_tests/widgets/register_content_fail/hook.js b/tests/general/widgets/register_content_fail/hook.js
similarity index 100%
rename from tests/system_tests/widgets/register_content_fail/hook.js
rename to tests/general/widgets/register_content_fail/hook.js

diff --git a/tests/system_tests/widgets/register_protocol/index.html b/tests/general/widgets/register_content_fail/index.html
similarity index 100%
rename from tests/system_tests/widgets/register_protocol/index.html
rename to tests/general/widgets/register_content_fail/index.html

diff --git a/tests/system_tests/widgets/register_protocol.wgt b/tests/general/widgets/register_protocol.wgt
similarity index 100%
rename from tests/system_tests/widgets/register_protocol.wgt
rename to tests/general/widgets/register_protocol.wgt

diff --git a/tests/system_tests/widgets/register_protocol/config.xml b/tests/general/widgets/register_protocol/config.xml
similarity index 100%
rename from tests/system_tests/widgets/register_protocol/config.xml
rename to tests/general/widgets/register_protocol/config.xml

diff --git a/tests/system_tests/widgets/register_protocol/hook.js b/tests/general/widgets/register_protocol/hook.js
similarity index 100%
rename from tests/system_tests/widgets/register_protocol/hook.js
rename to tests/general/widgets/register_protocol/hook.js

diff --git a/tests/system_tests/widgets/register_content_fail/index.html b/tests/general/widgets/register_protocol/index.html
similarity index 100%
rename from tests/system_tests/widgets/register_content_fail/index.html
rename to tests/general/widgets/register_protocol/index.html

diff --git a/tests/system_tests/widgets/register_protocol_fail.wgt b/tests/general/widgets/register_protocol_fail.wgt
similarity index 100%
rename from tests/system_tests/widgets/register_protocol_fail.wgt
rename to tests/general/widgets/register_protocol_fail.wgt

diff --git a/tests/system_tests/widgets/register_protocol_fail/config.xml b/tests/general/widgets/register_protocol_fail/config.xml
similarity index 100%
rename from tests/system_tests/widgets/register_protocol_fail/config.xml
rename to tests/general/widgets/register_protocol_fail/config.xml

diff --git a/tests/system_tests/widgets/register_protocol_fail/hook.js b/tests/general/widgets/register_protocol_fail/hook.js
similarity index 100%
rename from tests/system_tests/widgets/register_protocol_fail/hook.js
rename to tests/general/widgets/register_protocol_fail/hook.js

diff --git a/tests/system_tests/widgets/register_content/index.html b/tests/general/widgets/register_protocol_fail/index.html
similarity index 100%
rename from tests/system_tests/widgets/register_content/index.html
rename to tests/general/widgets/register_protocol_fail/index.html