From: Youngjae Shin <yj99.shin@samsung.com>
Date: Thu, 2 Apr 2020 05:24:00 +0000 (+0900)
Subject: fix errors related with media plugin
X-Git-Tag: submit/tizen/20200406.072014^0
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=e39d4cb5e66c9bd78757823aa9cc20b694972172;p=platform%2Fcore%2Fsystem%2Fmodes-plugins.git

fix errors related with media plugin
---

diff --git a/media/MediaFactory.cpp b/media/MediaFactory.cpp
index e37192b..0b8f1cf 100644
--- a/media/MediaFactory.cpp
+++ b/media/MediaFactory.cpp
@@ -23,10 +23,10 @@ MODES_NAMESPACE_USE;
 
 MediaFactory::MediaFactory()
 {
-	actionMap[SoundVolume::NAME[SYSTEM_VOLUME]] = SYSTEM_VOLUME;
-	actionMap[SoundVolume::NAME[NOTIFICATION_VOLUME]] = NOTIFICATION_VOLUME;
-	actionMap[SoundVolume::NAME[RINGTONE_VOLUME]] = RINGTONE_VOLUME;
-	actionMap[SoundVolume::NAME[MEDIA_VOLUME]] = MEDIA_VOLUME;
+	actionMap[SoundVolume::NAME[SYSTEM_VOL]] = SYSTEM_VOL;
+	actionMap[SoundVolume::NAME[NOTIFICATION_VOL]] = NOTIFICATION_VOL;
+	actionMap[SoundVolume::NAME[RINGTONE_VOL]] = RINGTONE_VOL;
+	actionMap[SoundVolume::NAME[MEDIA_VOL]] = MEDIA_VOL;
 	actionMap[MediaPlayer::NAME] = PLAYER;
 }
 
@@ -40,17 +40,17 @@ MediaAction* MediaFactory::createAction(const std::string &key)
 
 	MediaAction *action;
 	switch (search->second) {
-	case SYSTEM_VOLUME:
-		action = new SoundVolume(SYSTEM_VOLUME, SOUND_TYPE_SYSTEM);
+	case SYSTEM_VOL:
+		action = new SoundVolume(SYSTEM_VOL, SOUND_TYPE_SYSTEM);
 		break;
-	case NOTIFICATION_VOLUME:
-		action = new SoundVolume(NOTIFICATION_VOLUME, SOUND_TYPE_NOTIFICATION);
+	case NOTIFICATION_VOL:
+		action = new SoundVolume(NOTIFICATION_VOL, SOUND_TYPE_NOTIFICATION);
 		break;
-	case RINGTONE_VOLUME:
-		action = new SoundVolume(RINGTONE_VOLUME, SOUND_TYPE_RINGTONE);
+	case RINGTONE_VOL:
+		action = new SoundVolume(RINGTONE_VOL, SOUND_TYPE_RINGTONE);
 		break;
-	case MEDIA_VOLUME:
-		action = new SoundVolume(MEDIA_VOLUME, SOUND_TYPE_MEDIA);
+	case MEDIA_VOL:
+		action = new SoundVolume(MEDIA_VOL, SOUND_TYPE_MEDIA);
 		break;
 	case PLAYER:
 		action = new MediaPlayer();
diff --git a/media/MediaFactory.h b/media/MediaFactory.h
index 1ef5e4c..43465b7 100644
--- a/media/MediaFactory.h
+++ b/media/MediaFactory.h
@@ -30,10 +30,10 @@ public:
 	void destroyAction(MediaAction *action);
 private:
 	enum actionKey{
-		SYSTEM_VOLUME,
-		NOTIFICATION_VOLUME,
-		RINGTONE_VOLUME,
-		MEDIA_VOLUME,
+		SYSTEM_VOL,
+		NOTIFICATION_VOL,
+		RINGTONE_VOL,
+		MEDIA_VOL,
 		PLAYER
 	};
 
diff --git a/media/SoundVolume.cpp b/media/SoundVolume.cpp
index 03aa22f..7140772 100644
--- a/media/SoundVolume.cpp
+++ b/media/SoundVolume.cpp
@@ -26,9 +26,9 @@ MODES_NAMESPACE_USE;
 // It should align with actionKey in MediaFactory
 const std::string SoundVolume::NAME[4] = {
 	"systemVolume",
-	"notificationVolume"
+	"notificationVolume",
 	"ringtoneVolume",
-	"mediaVolume",
+	"mediaVolume"
 };
 
 SoundVolume::SoundVolume(int key, sound_type_e soundType)
diff --git a/unittests/mdsp_test_media.cpp b/unittests/mdsp_test_media.cpp
index ebc53b4..40d1279 100644
--- a/unittests/mdsp_test_media.cpp
+++ b/unittests/mdsp_test_media.cpp
@@ -69,34 +69,42 @@ protected:
 	static gboolean VolumeSetUndoIdler(gpointer data)
 	{
 		PluginAction *action;
+		action = nullptr;
 		result = plugin->set("mediaVolume", 5, &action);
 		EXPECT_EQ(MODES_ERROR_NONE, result);
 		plugin->undo(action);
 
+		action = nullptr;
 		result = plugin->set("systemVolume", 2, &action);
 		EXPECT_EQ(MODES_ERROR_NONE, result);
 		plugin->undo(action);
 
+		action = nullptr;
 		result = plugin->set("ringtoneVolume", 9, &action);
 		EXPECT_EQ(MODES_ERROR_NONE, result);
 		plugin->undo(action);
 
+		action = nullptr;
 		result = plugin->set("notificationVolume", 1, &action);
 		EXPECT_EQ(MODES_ERROR_NONE, result);
 		plugin->undo(action);
 
+		action = nullptr;
 		result = plugin->set("mediaVolume", -1, &action);
 		EXPECT_EQ(MODES_ERROR_NONE, result);
 		plugin->undo(action);
 
+		action = nullptr;
 		result = plugin->set("systemVolume", -1, &action);
 		EXPECT_EQ(MODES_ERROR_NONE, result);
 		plugin->undo(action);
 
+		action = nullptr;
 		result = plugin->set("ringtoneVolume", -1, &action);
 		EXPECT_EQ(MODES_ERROR_NONE, result);
 		plugin->undo(action);
 
+		action = nullptr;
 		result = plugin->set("notificationVolume", -1, &action);
 		EXPECT_EQ(MODES_ERROR_NONE, result);
 		plugin->undo(action);