Refactor recovery test

Change to use GTEST_FLAG to provide the gtest option

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

diff --git a/src/unit_tests/recovery_test.cc b/src/unit_tests/recovery_test.cc
index 194b2aa44bd4ed7b2f7ff86e677af3d8dac2df73..628929c569e29903c20df5702631837dec7e682a 100644 (file)
--- a/src/unit_tests/recovery_test.cc
+++ b/src/unit_tests/recovery_test.cc
@@ -36,18 +36,12 @@ enum class BackupType : int {
 };
 
 std::map<ReqType, std::string> install_req_filter = {
-  { ReqType::INSTALL_REQ,
-      "--gtest_filter=SmokeTest.RecoveryMode_Tpk_Installation" },
-  { ReqType::UNINSTALL_REQ,
-      "--gtest_filter=SmokeTest.RecoveryMode_Tpk_Uninstallation" },
-  { ReqType::UPDATE_REQ,
-      "--gtest_filter=SmokeTest.RecoveryMode_Tpk_Update" },
-  { ReqType::DELTA_REQ,
-      "--gtest_filter=SmokeTest.RecoveryMode_ForDelta" },
-  { ReqType::MOUNT_INSTALL_REQ,
-      "--gtest_filter=SmokeTest.RecoveryMode_ForMountInstall" },
-  { ReqType::MOUNT_UPDATE_REQ,
-      "--gtest_filter=SmokeTest.RecoveryMode_ForMountUpdate" }
+  { ReqType::INSTALL_REQ, "SmokeTest.RecoveryMode_Tpk_Installation" },
+  { ReqType::UNINSTALL_REQ, "SmokeTest.RecoveryMode_Tpk_Uninstallation" },
+  { ReqType::UPDATE_REQ, "SmokeTest.RecoveryMode_Tpk_Update" },
+  { ReqType::DELTA_REQ, "SmokeTest.RecoveryMode_ForDelta" },
+  { ReqType::MOUNT_INSTALL_REQ, "SmokeTest.RecoveryMode_ForMountInstall" },
+  { ReqType::MOUNT_UPDATE_REQ, "SmokeTest.RecoveryMode_ForMountUpdate" }
 };
 
 int delay = 1000000;
@@ -456,24 +450,13 @@ int main(int argc,  char** argv) {
   }
 
   try {
-    char buf[10][kBufSize] = { 0, };
-    std::vector<char *> gtest_argv;
-
-    gtest_argv.push_back(nullptr);
-    snprintf(buf[gtest_argv.size()], kBufSize,
-        "%s", install_req_filter[req_type].c_str());
-    gtest_argv.push_back(buf[gtest_argv.size()]);
+    testing::GTEST_FLAG(filter) = install_req_filter[req_type];
     if (repeat) {
-      snprintf(buf[gtest_argv.size()], kBufSize,
-          "--gtest_repeat=%d", repeat_count);
-      gtest_argv.push_back(buf[gtest_argv.size()]);
-      snprintf(buf[gtest_argv.size()], kBufSize, "--gtest_break_on_failure");
-      gtest_argv.push_back(buf[gtest_argv.size()]);
+      testing::GTEST_FLAG(repeat) = repeat_count;
+      testing::GTEST_FLAG(break_on_failure) = true;
     }
-    gtest_argv.push_back(nullptr);
-    int gtest_argc = gtest_argv.size();
 
-    testing::InitGoogleTest(&gtest_argc, gtest_argv.data());
+    testing::InitGoogleTest(&argc, argv);
     ::env = static_cast<smoke_test::SmokeEnvironment*>(
         testing::AddGlobalTestEnvironment(
             new smoke_test::SmokeEnvironment(ci::RequestMode::GLOBAL,