X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-ShadowView.cpp;h=6a4dc311ef162af5381f01c2ccaeacf3aa6addbb;hp=edc71f31ed2c99fb267fe4c1f46d30ea5d44b9f7;hb=HEAD;hpb=af70c4c72ccbf2f680bd43f67888224f97a361eb;ds=sidebyside

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ShadowView.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ShadowView.cpp
index edc71f3..fcbaf14 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-ShadowView.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ShadowView.cpp
@@ -15,10 +15,11 @@
  *
  */
 
-#include <iostream>
-#include <stdlib.h>
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
+#include <dali-toolkit/devel-api/controls/shadow-view/shadow-view.h>
+#include <stdlib.h>
+#include <iostream>
 
 using namespace Dali;
 using namespace Dali::Toolkit;
@@ -33,7 +34,6 @@ void shadow_view_cleanup(void)
   test_return_value = TET_PASS;
 }
 
-
 // Negative test case for a method
 int UtcDaliShadowViewUninitialized(void)
 {
@@ -45,13 +45,13 @@ int UtcDaliShadowViewUninitialized(void)
   {
     // New() must be called to create a GaussianBlurView or it wont be valid.
     Actor a = Actor::New();
-    view.Add( a );
-    DALI_TEST_CHECK( false );
+    view.Add(a);
+    DALI_TEST_CHECK(false);
   }
-  catch (Dali::DaliException& e)
+  catch(Dali::DaliException& e)
   {
     // Tests that a negative test of an assertion succeeds
-    DALI_TEST_PRINT_ASSERT( e );
+    DALI_TEST_PRINT_ASSERT(e);
     DALI_TEST_CHECK(!view);
   }
   END_TEST;
@@ -64,10 +64,10 @@ int UtcDaliShadowViewNew(void)
   tet_infoline("UtcDaliShadowViewNew");
 
   Toolkit::ShadowView view = Toolkit::ShadowView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Toolkit::ShadowView view2 = Toolkit::ShadowView::New(1.0f, 1.0f);
-  DALI_TEST_CHECK( view2 );
+  DALI_TEST_CHECK(view2);
   END_TEST;
 }
 
@@ -78,12 +78,12 @@ int UtcDaliShadowViewDownCast(void)
   tet_infoline("UtcDaliShadowViewDownCast");
 
   Toolkit::ShadowView view = Toolkit::ShadowView::New();
-  BaseHandle handle(view);
+  BaseHandle          handle(view);
 
-  Toolkit::ShadowView shadowView = Toolkit::ShadowView::DownCast( handle );
-  DALI_TEST_CHECK( view );
-  DALI_TEST_CHECK( shadowView );
-  DALI_TEST_CHECK( shadowView == view );
+  Toolkit::ShadowView shadowView = Toolkit::ShadowView::DownCast(handle);
+  DALI_TEST_CHECK(view);
+  DALI_TEST_CHECK(shadowView);
+  DALI_TEST_CHECK(shadowView == view);
   END_TEST;
 }
 
@@ -94,12 +94,12 @@ int UtcDaliShadowViewPropertyNames(void)
   tet_infoline("UtcDaliShadowViewPropertyNames");
 
   Toolkit::ShadowView view = Toolkit::ShadowView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   // Check the names, this names are used in the shader code,
   // if they change in the shader code, then it has to be updated here.
-  DALI_TEST_EQUALS( view.GetBlurStrengthPropertyIndex(), view.GetPropertyIndex("BlurStrengthProperty"), TEST_LOCATION );
-  DALI_TEST_EQUALS( view.GetShadowColorPropertyIndex(), view.GetPropertyIndex("ShadowColorProperty"), TEST_LOCATION );
+  DALI_TEST_EQUALS(view.GetBlurStrengthPropertyIndex(), view.GetPropertyIndex("BlurStrengthProperty"), TEST_LOCATION);
+  DALI_TEST_EQUALS(view.GetShadowColorPropertyIndex(), view.GetPropertyIndex("ShadowColorProperty"), TEST_LOCATION);
   END_TEST;
 }
 
@@ -110,22 +110,21 @@ int UtcDaliShadowViewAddRemove(void)
   tet_infoline("UtcDaliShadowViewAddRemove");
 
   Toolkit::ShadowView view = Toolkit::ShadowView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
   Actor actor = Actor::New();
-  DALI_TEST_CHECK( !actor.OnStage() );
-
+  DALI_TEST_CHECK(!actor.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE));
 
-  view.SetParentOrigin(ParentOrigin::CENTER);
-  view.SetSize(Stage::GetCurrent().GetSize());
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  view.SetProperty(Actor::Property::SIZE, application.GetScene().GetSize());
   view.Add(actor);
-  Stage::GetCurrent().Add(view);
+  application.GetScene().Add(view);
 
-  DALI_TEST_CHECK( actor.OnStage() );
+  DALI_TEST_CHECK(actor.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE));
 
   view.Remove(actor);
 
-  DALI_TEST_CHECK( !actor.OnStage() );
+  DALI_TEST_CHECK(!actor.GetProperty<bool>(Actor::Property::CONNECTED_TO_SCENE));
   END_TEST;
 }
 
@@ -136,23 +135,23 @@ int UtcDaliShadowViewActivateDeactivate(void)
   tet_infoline("UtcDaliShadowViewActivateDeactivate");
 
   Toolkit::ShadowView view = Toolkit::ShadowView::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
-  RenderTaskList taskList = Stage::GetCurrent().GetRenderTaskList();
-  DALI_TEST_CHECK( 1u == taskList.GetTaskCount() );
+  RenderTaskList taskList = application.GetScene().GetRenderTaskList();
+  DALI_TEST_CHECK(1u == taskList.GetTaskCount());
 
-  view.SetParentOrigin(ParentOrigin::CENTER);
-  view.SetSize(Stage::GetCurrent().GetSize());
+  view.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::CENTER);
+  view.SetProperty(Actor::Property::SIZE, application.GetScene().GetSize());
   view.Add(Actor::New());
-  Stage::GetCurrent().Add(view);
+  application.GetScene().Add(view);
   view.Activate();
 
-  RenderTaskList taskList2 = Stage::GetCurrent().GetRenderTaskList();
-  DALI_TEST_CHECK( 1u != taskList2.GetTaskCount() );
+  RenderTaskList taskList2 = application.GetScene().GetRenderTaskList();
+  DALI_TEST_CHECK(1u != taskList2.GetTaskCount());
 
   view.Deactivate();
 
-  RenderTaskList taskList3 = Stage::GetCurrent().GetRenderTaskList();
-  DALI_TEST_CHECK( 1u == taskList3.GetTaskCount() );
+  RenderTaskList taskList3 = application.GetScene().GetRenderTaskList();
+  DALI_TEST_CHECK(1u == taskList3.GetTaskCount());
   END_TEST;
 }