clean up and allign the mode file name

diff --git a/app/AppActionLaunch.cpp b/app/AppActionLaunch.cpp
index 0993e1a..a6ff7c2 100644 (file)
--- a/app/AppActionLaunch.cpp
+++ b/app/AppActionLaunch.cpp
@@ -114,7 +114,7 @@ int AppActionLaunch::undo()
                return MODES_ERROR_NONE;
        }
 
-       int ret = app_manager_unset_app_context_status_cb(AppActionLaunch::appContextStatusCallback, appID.c_str());
+       int ret = app_manager_unset_app_context_status_cb(appContextStatusCallback, appID.c_str());
        if (APP_MANAGER_ERROR_NONE != ret)
                ERR("app_manager_unset_app_context_status_cb() Fail(%s)", get_error_message(ret));
 

diff --git a/unittests/mdsp_test_app.cpp b/unittests/mdsp_test_app.cpp
index 1c59402..0afdd37 100644 (file)
--- a/unittests/mdsp_test_app.cpp
+++ b/unittests/mdsp_test_app.cpp
@@ -49,7 +49,7 @@ protected:
                result = plugin->set("launch", std::string("org.tizen.net-popup"), &action);
                EXPECT_EQ(MODES_ERROR_NONE, result);
 
-               app_context_h runAppContext;
+               app_context_h runAppContext = NULL;
                app_manager_get_app_context("org.tizen.net-popup", &runAppContext);
                app_manager_terminate_app(runAppContext);
                result = plugin->undo(action);

diff --git a/unittests/mdsp_test_integration.cpp b/unittests/mdsp_test_integration.cpp
index f8a57cd..254ab58 100644 (file)
--- a/unittests/mdsp_test_integration.cpp
+++ b/unittests/mdsp_test_integration.cpp
@@ -72,7 +72,7 @@ TEST_F(IntegrationTest, runMode_btOn)
 
 TEST_F(IntegrationTest, runMode_powerSave)
 {
-       g_idle_add(check_mode_idler, (gpointer)"powerSave");
+       g_idle_add(check_mode_idler, (gpointer)"Power-Save");
        g_main_loop_run(loop);
        EXPECT_EQ(MODES_ERROR_NONE, result);
 }
@@ -86,14 +86,14 @@ TEST_F(IntegrationTest, runMode_displayBlock)
 
 TEST_F(IntegrationTest, runMode_wifiOn)
 {
-       g_idle_add(check_mode_idler, (gpointer)"wifiOn");
+       g_idle_add(check_mode_idler, (gpointer)"wifi-on");
        g_main_loop_run(loop);
        EXPECT_EQ(MODES_ERROR_NONE, result);
 }
 
 TEST_F(IntegrationTest, runMode_waterlock)
 {
-       g_idle_add(check_mode_idler, (gpointer)"waterlock");
+       g_idle_add(check_mode_idler, (gpointer)"Water-Lock");
        g_main_loop_run(loop);
        EXPECT_EQ(MODES_ERROR_NONE, result);
 }

diff --git a/unittests/mode/tizen_powerSave_mode.xml b/unittests/mode/tizen_Power-Save_mode.xml
similarity index 100%
rename from unittests/mode/tizen_powerSave_mode.xml
rename to unittests/mode/tizen_Power-Save_mode.xml

diff --git a/unittests/mode/tizen_quickpanel_mode.xml b/unittests/mode/tizen_Quick-Panel_mode.xml
similarity index 100%
rename from unittests/mode/tizen_quickpanel_mode.xml
rename to unittests/mode/tizen_Quick-Panel_mode.xml

diff --git a/unittests/mode/tizen_waterlock_mode.xml b/unittests/mode/tizen_Water-Lock_mode.xml
similarity index 100%
rename from unittests/mode/tizen_waterlock_mode.xml
rename to unittests/mode/tizen_Water-Lock_mode.xml

diff --git a/unittests/mode/tizen_wifiOn_mode.xml b/unittests/mode/tizen_wifi-on_mode.xml
similarity index 100%
rename from unittests/mode/tizen_wifiOn_mode.xml
rename to unittests/mode/tizen_wifi-on_mode.xml