unittest: pass_gtest: Use dbus defintion 85/223785/2 accepted/tizen/unified/20200207.122419 submit/tizen/20200206.041536
authorChanwoo Choi <cw00.choi@samsung.com>
Tue, 4 Feb 2020 03:27:59 +0000 (12:27 +0900)
committerChanwoo Choi <cw00.choi@samsung.com>
Tue, 4 Feb 2020 03:39:04 +0000 (12:39 +0900)
The supported dbus path/interface were defined in gdbus-defintion.sh.
So that use the dbus defintion to remove the potential error.

Change-Id: Icebefcbb58a7d135eda873ed827ea7c2d50e59b3
Signed-off-by: Chanwoo Choi <cw00.choi@samsung.com>
unittest/pass_gtest.cpp

index 9bef5d14a32012ea859abe87b611fe8db077054d..9dd723eec730a8b432c0833e35ef1f44d7eca0c0 100644 (file)
@@ -88,8 +88,8 @@ TEST_F(PowerMgntTest, PmqosSendDbus_HandlesValidAppLaunch)
 {
        gint32 ret;
 
-       ret = pass_test_method_call(DBUS_PASS_PATH"/Pmqos",
-                                               DBUS_PASS_BUS_NAME".pmqos",
+       ret = pass_test_method_call(DBUS_PMQOS_PATH,
+                                               DBUS_PMQOS_INTERFACE,
                                                "AppLaunch",
                                                g_variant_new("(i)", 3000));
        ASSERT_EQ(ret, 0) << "AppLaunch Failed";
@@ -101,8 +101,8 @@ TEST_F(PowerMgntTest, PmqosSendDbus_HandlesValidMultipleAppLaunch)
        int i;
 
        for (i = 0; i < 3; i++) {
-               ret = pass_test_method_call(DBUS_PASS_PATH"/Pmqos",
-                                               DBUS_PASS_BUS_NAME".pmqos",
+               ret = pass_test_method_call(DBUS_PMQOS_PATH,
+                                               DBUS_PMQOS_INTERFACE,
                                                "AppLaunch",
                                                g_variant_new("(i)", 3000));
                ASSERT_EQ(ret, 0) << "MultipleAppLaunch Failed";
@@ -113,14 +113,14 @@ TEST_F(PowerMgntTest, PmqosSendDbus_HandlesValidUltraPowerSaving)
 {
        gint32 ret;
 
-       ret = pass_test_method_call(DBUS_PASS_PATH"/Pmqos",
-                                       DBUS_PASS_BUS_NAME".pmqos",
+       ret = pass_test_method_call(DBUS_PMQOS_PATH,
+                                       DBUS_PMQOS_INTERFACE,
                                        "AppLaunch",
                                        g_variant_new("(i)", 3000));
        ASSERT_EQ(ret, 0) << "AppLaunch Failed";
 
-       ret = pass_test_method_call(DBUS_PASS_PATH"/Pmqos",
-                                       DBUS_PASS_BUS_NAME".pmqos",
+       ret = pass_test_method_call(DBUS_PMQOS_PATH,
+                                       DBUS_PMQOS_INTERFACE,
                                        "UltraPowerSaving",
                                        g_variant_new("(i)", 3000));
        ASSERT_EQ(ret, 0) << "UltraPowerSaving Failed";
@@ -130,20 +130,20 @@ TEST_F(PowerMgntTest, PmqosSendDbus_HandlesInvalidInput)
 {
        gint32 ret;
 
-       ret = pass_test_method_call(DBUS_PASS_PATH"/Pmqos",
-                                       DBUS_PASS_BUS_NAME".pmqos",
+       ret = pass_test_method_call(DBUS_PMQOS_PATH,
+                                       DBUS_PMQOS_INTERFACE,
                                        "stop",
                                        NULL);
        ASSERT_EQ(ret, 0) << "PmQosStop Failed";
 
-       ret = pass_test_method_call(DBUS_PASS_PATH"/Pmqos",
-                                       DBUS_PASS_BUS_NAME".pmqos",
+       ret = pass_test_method_call(DBUS_PMQOS_PATH,
+                                       DBUS_PMQOS_INTERFACE,
                                        "AppLaunch",
                                        g_variant_new("(i)", 3000));
        ASSERT_EQ(ret, -1) << "AppLaunch Failed";
 
-       ret = pass_test_method_call(DBUS_PASS_PATH"/Pmqos",
-                                       DBUS_PASS_BUS_NAME".pmqos",
+       ret = pass_test_method_call(DBUS_PMQOS_PATH,
+                                       DBUS_PMQOS_INTERFACE,
                                        "start",
                                        NULL);
        ASSERT_EQ(ret, 0) << "PmQosStart Failed";
@@ -153,26 +153,26 @@ TEST_F(PowerMgntTest, PmqosSendDbus_RestartsPmqos)
 {
        gint32 ret;
 
-       ret = pass_test_method_call(DBUS_PASS_PATH"/Pmqos",
-                                       DBUS_PASS_BUS_NAME".pmqos",
+       ret = pass_test_method_call(DBUS_PMQOS_PATH,
+                                       DBUS_PMQOS_INTERFACE,
                                        "start",
                                        NULL);
        ASSERT_EQ(ret, 0) << "PmQosStart Failed";
 
-       ret = pass_test_method_call(DBUS_PASS_PATH"/Pmqos",
-                                       DBUS_PASS_BUS_NAME".pmqos",
+       ret = pass_test_method_call(DBUS_PMQOS_PATH,
+                                       DBUS_PMQOS_INTERFACE,
                                        "stop",
                                        NULL);
        ASSERT_EQ(ret, 0) << "PmQosStop Failed";
 
-       ret = pass_test_method_call(DBUS_PASS_PATH"/Pmqos",
-                                       DBUS_PASS_BUS_NAME".pmqos",
+       ret = pass_test_method_call(DBUS_PMQOS_PATH,
+                                       DBUS_PMQOS_INTERFACE,
                                        "start",
                                        NULL);
        ASSERT_EQ(ret, 0) << "PmQosStart Failed";
 
-       ret = pass_test_method_call(DBUS_PASS_PATH"/Pmqos",
-                                       DBUS_PASS_BUS_NAME".pmqos",
+       ret = pass_test_method_call(DBUS_PMQOS_PATH,
+                                       DBUS_PMQOS_INTERFACE,
                                        "AppLaunch",
                                        g_variant_new("(i)", 3000));
        ASSERT_EQ(ret, 0) << "PmQosStop  Failed";
@@ -205,20 +205,20 @@ TEST_F(PowerMgntTest, CoreSendDbus_RestartsCore)
 {
        gint32 ret;
 
-       ret = pass_test_method_call(DBUS_PASS_PATH"/Core",
-                                       DBUS_PASS_BUS_NAME".core",
+       ret = pass_test_method_call(DBUS_CORE_PATH,
+                                       DBUS_CORE_INTERFACE,
                                        "start",
                                        NULL);
        ASSERT_EQ(ret, 0) << "PassCoreStart Failed";
 
-       ret = pass_test_method_call(DBUS_PASS_PATH"/Core",
-                                       DBUS_PASS_BUS_NAME".core",
+       ret = pass_test_method_call(DBUS_CORE_PATH,
+                                       DBUS_CORE_INTERFACE,
                                        "stop",
                                        NULL);
        ASSERT_EQ(ret, 0) << "PassCoreStop Failed";
 
-       ret = pass_test_method_call(DBUS_PASS_PATH"/Core",
-                                       DBUS_PASS_BUS_NAME".core",
+       ret = pass_test_method_call(DBUS_CORE_PATH,
+                                       DBUS_CORE_INTERFACE,
                                        "start",
                                        NULL);
        ASSERT_EQ(ret, 0) << "PassCoreStart Failed";