Change to use gmock package instead of gtest

Change-Id: Ic5326d91b98ba9c1a17686f118e9740a229aa77b
Signed-off-by: Ilho Kim <ilho159.kim@samsung.com>

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 3c72b064438a4f8e45a1c23d77985e48efe1dad9..3b7478d9cb10c10540f0876ce5a864851f0ff91c 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -52,9 +52,9 @@ PKG_CHECK_MODULES(VCONF_DEPS REQUIRED vconf)
 PKG_CHECK_MODULES(CAPI_SYSTEM_INFO_DEPS REQUIRED capi-system-info)
 PKG_CHECK_MODULES(TTRACE_DEPS REQUIRED ttrace)
 PKG_CHECK_MODULES(GUM_DEPS REQUIRED libgum)
+PKG_CHECK_MODULES(GMOCK_DEPS REQUIRED gmock)
 
 FIND_PACKAGE(Boost REQUIRED COMPONENTS system filesystem regex program_options)
-FIND_PACKAGE(GTest REQUIRED)
 
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(test)

diff --git a/packaging/tpk-backend.spec b/packaging/tpk-backend.spec
index d2c5850f2eec3d13a60f7bd59e537a7a022c9b33..d577e7eea0a992cdb702574b968b9c91cc282de6 100644 (file)
--- a/packaging/tpk-backend.spec
+++ b/packaging/tpk-backend.spec
@@ -12,7 +12,6 @@ Source1002:     tpk-installer-tests.manifest
 Requires:       tpk-installer = %{version}
 BuildRequires:  boost-devel
 BuildRequires:  cmake
-BuildRequires:  gtest-devel
 BuildRequires:  app-installers-tests
 BuildRequires:  pkgconfig(app-installers)
 BuildRequires:  pkgconfig(manifest-parser)
@@ -23,6 +22,7 @@ BuildRequires:  pkgconfig(vconf)
 BuildRequires:  pkgconfig(capi-system-info)
 BuildRequires:  pkgconfig(ttrace)
 BuildRequires:  pkgconfig(libgum)
+BuildRequires:  pkgconfig(gmock)
 
 %description
 Backend for tizen package files

diff --git a/test/smoke_tests/CMakeLists.txt b/test/smoke_tests/CMakeLists.txt
index d027ef84a28e6bd846492c4f86a4bd00cc8f9c2d..879b830200279b8202799deb79a5b8ea4c40b175 100644 (file)
--- a/test/smoke_tests/CMakeLists.txt
+++ b/test/smoke_tests/CMakeLists.txt
@@ -42,21 +42,21 @@ INSTALL(DIRECTORY test_samples/ DESTINATION ${SHAREDIR}/${DESTINATION_DIR}/test_
 
 APPLY_PKG_CONFIG(${TARGET_SMOKE_TEST} PUBLIC
   Boost
-  GTEST
+  GMOCK_DEPS
   GUM_DEPS
 )
 APPLY_PKG_CONFIG(${TARGET_SMOKE_TEST_EXTENSIVE} PUBLIC
   Boost
-  GTEST
+  GMOCK_DEPS
   GUM_DEPS
 )
 APPLY_PKG_CONFIG(${TARGET_MANIFEST_TEST} PUBLIC
   Boost
-  GTEST
+  GMOCK_DEPS
 )
 APPLY_PKG_CONFIG(${TARGET_RECOVERY_TEST} PUBLIC
   Boost
-  GTEST
+  GMOCK_DEPS
   GUM_DEPS
 )
 

diff --git a/test/smoke_tests/manifest_test.cc b/test/smoke_tests/manifest_test.cc
index 383b90861917c85f96818480d4c4fb038d4ee08c..b1a9aef79906123d159870b4e98ab8fc01f5403f 100644 (file)
--- a/test/smoke_tests/manifest_test.cc
+++ b/test/smoke_tests/manifest_test.cc
@@ -59,3 +59,22 @@ application_x* GetSingleApp(manifest_x* m) {
     return nullptr;
   return *apps.begin();
 }
+
+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;
+}

diff --git a/test/smoke_tests/smoke_test.cc b/test/smoke_tests/smoke_test.cc
index 124ca325dd0a52205b5e340aad43381df7fbeee4..c026b892d0dcd62f8b0fd5b6543a8e4fd6fbd9e3 100644 (file)
--- a/test/smoke_tests/smoke_test.cc
+++ b/test/smoke_tests/smoke_test.cc
@@ -806,7 +806,7 @@ TEST_F(SmokeTest, RecoveryMode_CrashAfterUnzip) {
   ASSERT_FALSE(recovery_file.empty());
   std::unique_ptr<ci::recovery::RecoveryFile> recovery_info =
       GetRecoverFileInfo(recovery_file);
-  ASSERT_TRUE(recovery_info);
+  ASSERT_TRUE(recovery_info ? true : false);
   ASSERT_EQ(backend.Recover(recovery_file), ci::AppInstaller::Result::OK);
   ASSERT_TRUE(CheckPackageNonExistance(pkgid, params));
   ASSERT_FALSE(bf::exists(recovery_info->unpacked_dir()));