Change to use gmock package instead of gtest 72/239872/4
authorIlho Kim <ilho159.kim@samsung.com>
Wed, 29 Jul 2020 04:53:03 +0000 (13:53 +0900)
committerIlho Kim <ilho159.kim@samsung.com>
Tue, 25 Aug 2020 09:02:15 +0000 (18:02 +0900)
Change-Id: Ib1ca4234065363a7e3116a5278ed3043dea79dfb
Signed-off-by: Ilho Kim <ilho159.kim@samsung.com>
CMakeLists.txt
packaging/app-installers.spec
test/smoke_tests/CMakeLists.txt
test/smoke_tests/common/CMakeLists.txt
test/smoke_tests/plugins_smoketest.cc
test/smoke_tests/signature_smoketest.cc

index 48ea915..8f5a18e 100644 (file)
@@ -65,9 +65,9 @@ PKG_CHECK_MODULES(STORAGE_DEPS REQUIRED storage)
 PKG_CHECK_MODULES(LIBSYSTEMD_DEPS REQUIRED libsystemd)
 PKG_CHECK_MODULES(TTRACE_DEPS REQUIRED ttrace)
 PKG_CHECK_MODULES(TRUST_ANCHOR_DEPS REQUIRED tanchor)
+PKG_CHECK_MODULES(GMOCK_DEPS REQUIRED gmock)
 
 FIND_PACKAGE(Boost REQUIRED COMPONENTS system filesystem program_options iostreams)
-FIND_PACKAGE(GTest REQUIRED)
 
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(test)
index 40b59c4..cf00314 100644 (file)
@@ -10,7 +10,6 @@ Source1001:     app-installers-tests.manifest
 
 BuildRequires:  boost-devel
 BuildRequires:  cmake
-BuildRequires:  gtest-devel
 BuildRequires:  pkgconfig(pkgmgr)
 BuildRequires:  pkgconfig(pkgmgr-parser)
 BuildRequires:  pkgconfig(pkgmgr-info)
@@ -40,6 +39,7 @@ BuildRequires:  pkgconfig(libsystemd)
 BuildRequires:  pkgconfig(ttrace)
 BuildRequires:  pkgconfig(tanchor)
 BuildRequires:  pkgconfig(libsmack)
+BuildRequires:  pkgconfig(gmock)
 
 Requires: ca-certificates-tizen
 Requires: libtzplatform-config
index 4d9c161..0c7b3d0 100644 (file)
@@ -26,12 +26,12 @@ INSTALL(DIRECTORY test_samples/ DESTINATION ${SHAREDIR}/${DESTINATION_DIR}/test_
 
 APPLY_PKG_CONFIG(${TARGET_SIGNATURE_TEST} PUBLIC
   Boost
-  GTEST
+  GMOCK_DEPS
 )
 
 APPLY_PKG_CONFIG(${TARGET_PLUGINS_TEST} PUBLIC
   Boost
-  GTEST
+  GMOCK_DEPS
 )
 
 # FindGTest module do not sets all needed libraries in GTEST_LIBRARIES and
index afbb867..0871179 100644 (file)
@@ -4,7 +4,7 @@ ADD_LIBRARY(${TARGET_SMOKE_UTILS} SHARED
 
 APPLY_PKG_CONFIG(${TARGET_SMOKE_UTILS} PUBLIC
   Boost
-  GTEST
+  GMOCK_DEPS
   GUM_DEPS
 )
 
index 1607474..956baaa 100644 (file)
@@ -217,3 +217,22 @@ CALLING_PLUGIN_FOR_FAIL_ACTION_TEST(Upgrade, Plugin::ActionType::Upgrade)
 CALLING_PLUGIN_FOR_FAIL_ACTION_TEST(Uninstall, Plugin::ActionType::Uninstall)
 
 }  // namespace common_installer
+
+int main(int argc, char** argv) {
+  int ret = -1;
+  try {
+    testing::InitGoogleTest(&argc, argv);
+  } catch(...) {
+    std::cout << "Exception occurred" << std::endl;
+  }
+
+  try {
+    ret = RUN_ALL_TESTS();
+  } catch (const ::testing::internal::GoogleTestFailureException& e) {
+    ret = -1;
+    std::cout << "GoogleTestFailureException was thrown:" << e.what()
+              << std::endl;
+  }
+
+  return ret;
+}
index c804db8..0d694ce 100644 (file)
@@ -43,3 +43,22 @@ TEST_F(SignatureValidatorTest, HandlesBadSignatureDir) {
 
 }  // namespace security
 }  // namespace common_installer
+
+int main(int argc, char** argv) {
+  int ret = -1;
+  try {
+    testing::InitGoogleTest(&argc, argv);
+  } catch(...) {
+    std::cout << "Exception occurred" << std::endl;
+  }
+
+  try {
+    ret = RUN_ALL_TESTS();
+  } catch (const ::testing::internal::GoogleTestFailureException& e) {
+    ret = -1;
+    std::cout << "GoogleTestFailureException was thrown:" << e.what()
+              << std::endl;
+  }
+
+  return ret;
+}