From: ChaJiWon <jw_wonny.cha@samsung.com>
Date: Wed, 6 Jul 2016 04:23:24 +0000 (+0900)
Subject: Modified Scene UnitTest
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=d831ab4aabb80ca652c6c26b95939ceff0bd8879;p=contrib%2Fiotivity.git

Modified Scene UnitTest

Scene container is changed to unordered_map in SceneCollection.
Apply the change to 'getAllSceneInstance' logic.

Change-Id: I48916883b115c7eb57cfe63d1ae55d6d2ee1c430
Signed-off-by: ChaJiWon <jw_wonny.cha@samsung.com>
Reviewed-on: https://gerrit.iotivity.org/gerrit/9205
Tested-by: jenkins-iotivity <jenkins-iotivity@opendaylight.org>
Reviewed-by: Uze Choi <uzchoi@samsung.com>
Tested-by: Uze Choi <uzchoi@samsung.com>
(cherry picked from commit f162cb2234428750943373d939415fb09fd103d8)
Reviewed-on: https://gerrit.iotivity.org/gerrit/10267
Reviewed-by: Madan Lanka <lanka.madan@samsung.com>
---

diff --git a/service/scene-manager/unittests/SceneTest.cpp b/service/scene-manager/unittests/SceneTest.cpp
index fc1ec4c..80f250e 100755
--- a/service/scene-manager/unittests/SceneTest.cpp
+++ b/service/scene-manager/unittests/SceneTest.cpp
@@ -142,8 +142,16 @@ TEST_F(SceneTest, getAllSceneInstance)
 
     for(const auto &it : scenes)
     {
-        ASSERT_EQ(it.first, sceneNames.at(count++));
+        for (const auto &name : sceneNames)
+        {
+                if(it.first == name)
+                {
+                        count++;
+                        break;
+                }
+        }
     }
+    ASSERT_EQ(count, 2);
 }
 
 TEST_F(SceneTest, getSceneActionUsingRemoteResource)
@@ -197,4 +205,4 @@ TEST_F(SceneTest, executeSceneUsingEmptyCallback)
     pScene1->addNewSceneAction(pRemoteResource2, KEY_2, VALUE_2);
 
     ASSERT_THROW(pScene1->execute(nullptr), RCSInvalidParameterException);
-}
\ No newline at end of file
+}