X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali%2Futc-Dali-Scene.cpp;h=26a7070ed57f7f84bc94ab8a5c8351a322b75469;hb=ebbd710c73bbbdf89bbfa2d686ac6d0c3856a458;hp=a9a415e189b4c006d20a8bb84272452d0fcd8493;hpb=d665cfb6777d7fb24cadb0e7309d30e2945945c2;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/automated-tests/src/dali/utc-Dali-Scene.cpp b/automated-tests/src/dali/utc-Dali-Scene.cpp
index a9a415e..26a7070 100644
--- a/automated-tests/src/dali/utc-Dali-Scene.cpp
+++ b/automated-tests/src/dali/utc-Dali-Scene.cpp
@@ -429,12 +429,26 @@ int UtcDaliSceneGet(void)
 
   Dali::Integration::Scene scene = application.GetScene();
 
-  Actor actor = Actor::New();
-  DALI_TEST_CHECK(Dali::Integration::Scene() == Dali::Integration::Scene::Get(actor));
+  Actor parent = Actor::New();
+  Actor child  = Actor::New();
 
-  scene.Add(actor);
+  parent.Add(child);
+
+  // Should be empty scene
+  DALI_TEST_CHECK(Dali::Integration::Scene() == Dali::Integration::Scene::Get(parent));
+  DALI_TEST_CHECK(Dali::Integration::Scene() == Dali::Integration::Scene::Get(child));
+
+  scene.Add(parent);
 
-  DALI_TEST_CHECK(scene == Dali::Integration::Scene::Get(actor));
+  // Should return the valid scene
+  DALI_TEST_CHECK(scene == Dali::Integration::Scene::Get(parent));
+  DALI_TEST_CHECK(scene == Dali::Integration::Scene::Get(child));
+
+  parent.Unparent();
+
+  // Should be empty scene
+  DALI_TEST_CHECK(Dali::Integration::Scene() == Dali::Integration::Scene::Get(parent));
+  DALI_TEST_CHECK(Dali::Integration::Scene() == Dali::Integration::Scene::Get(child));
 
   END_TEST;
 }
@@ -1737,4 +1751,4 @@ int UtcDaliSceneWheelEventGeneratedSignalP(void)
   DALI_TEST_CHECK(event2.delta == data.receivedWheelEvent.GetDelta());
   DALI_TEST_CHECK(event2.timeStamp == data.receivedWheelEvent.GetTime());
   END_TEST;
-}
\ No newline at end of file
+}