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-Magnifier.cpp;h=984518faa5f809d16f01065ec5adb2cc2af2d979;hp=c8e07741fafbf7e18c0eb0b1fcc1ac77719ed9e2;hb=HEAD;hpb=5e937a6322849b76d49d5b3f41cb5d91c94acd3e

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Magnifier.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Magnifier.cpp
index c8e0774..fdf690d 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-Magnifier.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Magnifier.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2022 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,12 +15,12 @@
  *
  */
 
-#include <iostream>
-#include <stdlib.h>
-#include <sstream>
 #include <dali-toolkit-test-suite-utils.h>
 #include <dali-toolkit/dali-toolkit.h>
 #include <dali-toolkit/devel-api/controls/magnifier/magnifier.h>
+#include <stdlib.h>
+#include <iostream>
+#include <sstream>
 
 using namespace Dali;
 using namespace Toolkit;
@@ -40,12 +40,12 @@ int UtcDaliMagnifierNew(void)
   ToolkitTestApplication application;
 
   Magnifier magnifier;
-  DALI_TEST_CHECK( !magnifier );
+  DALI_TEST_CHECK(!magnifier);
 
   magnifier = Magnifier::New();
-  DALI_TEST_CHECK( magnifier );
+  DALI_TEST_CHECK(magnifier);
 
-  Stage::GetCurrent().Add( magnifier );
+  application.GetScene().Add(magnifier);
 
   application.SendNotification();
   application.Render();
@@ -58,20 +58,20 @@ int UtcDaliMagnifierCopyAndAssignment(void)
   ToolkitTestApplication application;
 
   Magnifier view = Magnifier::New();
-  DALI_TEST_CHECK( view );
+  DALI_TEST_CHECK(view);
 
-  Magnifier copy( view );
-  DALI_TEST_CHECK( copy == view );
+  Magnifier copy(view);
+  DALI_TEST_CHECK(copy == view);
 
   Magnifier assign;
-  DALI_TEST_CHECK( !assign );
+  DALI_TEST_CHECK(!assign);
   assign = view;
-  DALI_TEST_CHECK( assign == view );
+  DALI_TEST_CHECK(assign == view);
 
   // Self assignment
   assign = assign;
-  DALI_TEST_CHECK( assign );
-  DALI_TEST_CHECK( assign == view );
+  DALI_TEST_CHECK(assign);
+  DALI_TEST_CHECK(assign == view);
 
   END_TEST;
 }
@@ -81,13 +81,13 @@ int UtcDaliMagnifierDownCast(void)
   ToolkitTestApplication application;
 
   BaseHandle view = Magnifier::New();
-  DALI_TEST_CHECK( Magnifier::DownCast( view ) );
+  DALI_TEST_CHECK(Magnifier::DownCast(view));
 
   BaseHandle empty;
-  DALI_TEST_CHECK( ! Magnifier::DownCast( empty ) );
+  DALI_TEST_CHECK(!Magnifier::DownCast(empty));
 
   BaseHandle another = Actor::New();
-  DALI_TEST_CHECK( ! Magnifier::DownCast( another ) );
+  DALI_TEST_CHECK(!Magnifier::DownCast(another));
 
   END_TEST;
 }
@@ -97,16 +97,16 @@ int UtcDaliMagnifierTypeRegistry(void)
   ToolkitTestApplication application;
 
   TypeRegistry typeRegistry = TypeRegistry::Get();
-  DALI_TEST_CHECK( typeRegistry );
+  DALI_TEST_CHECK(typeRegistry);
 
-  TypeInfo typeInfo = typeRegistry.GetTypeInfo( "Magnifier" );
-  DALI_TEST_CHECK( typeInfo );
+  TypeInfo typeInfo = typeRegistry.GetTypeInfo("Magnifier");
+  DALI_TEST_CHECK(typeInfo);
 
   BaseHandle handle = typeInfo.CreateInstance();
-  DALI_TEST_CHECK( handle );
+  DALI_TEST_CHECK(handle);
 
-  Magnifier view = Magnifier::DownCast( handle );
-  DALI_TEST_CHECK( view );
+  Magnifier view = Magnifier::DownCast(handle);
+  DALI_TEST_CHECK(view);
 
   END_TEST;
 }
@@ -115,27 +115,27 @@ int UtcDaliMagnifierSetSourceActorP(void)
 {
   ToolkitTestApplication application;
 
-  Stage stage = Stage::GetCurrent();
+  Integration::Scene stage = application.GetScene();
 
   Magnifier view = Magnifier::New();
-  stage.Add( view );
+  stage.Add(view);
 
   application.SendNotification();
   application.Render();
 
   RenderTaskList renderTaskList = stage.GetRenderTaskList();
-  DALI_TEST_CHECK( renderTaskList.GetTaskCount() > 1 );
+  DALI_TEST_CHECK(renderTaskList.GetTaskCount() > 1);
 
   Actor actor = Actor::New();
-  stage.Add( actor );
-  DALI_TEST_CHECK( stage.GetRenderTaskList().GetTask( 1 ).GetSourceActor() != actor );
+  stage.Add(actor);
+  DALI_TEST_CHECK(stage.GetRenderTaskList().GetTask(1).GetSourceActor() != actor);
 
-  view.SetSourceActor( actor );
+  view.SetSourceActor(actor);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( stage.GetRenderTaskList().GetTask( 1 ).GetSourceActor(), actor, TEST_LOCATION );
+  DALI_TEST_EQUALS(stage.GetRenderTaskList().GetTask(1).GetSourceActor(), actor, TEST_LOCATION);
 
   END_TEST;
 }
@@ -148,12 +148,12 @@ int UtcDaliMagnifierSetSourceActorN(void)
 
   try
   {
-    view.SetSourceActor( Actor::New() );
-    DALI_TEST_CHECK( false ); // should not get here
+    view.SetSourceActor(Actor::New());
+    DALI_TEST_CHECK(false); // should not get here
   }
-  catch( ... )
+  catch(...)
   {
-    DALI_TEST_CHECK( true );
+    DALI_TEST_CHECK(true);
   }
 
   END_TEST;
@@ -163,31 +163,31 @@ int UtcDaliMagnifierFrameVisibility(void)
 {
   ToolkitTestApplication application;
 
-  Stage stage = Stage::GetCurrent();
+  Integration::Scene stage = application.GetScene();
 
   Magnifier view = Magnifier::New();
-  stage.Add( view );
+  stage.Add(view);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( view.GetProperty( Magnifier::Property::FRAME_VISIBILITY ).Get< bool >(), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(view.GetProperty(Magnifier::Property::FRAME_VISIBILITY).Get<bool>(), true, TEST_LOCATION);
 
-  view.SetProperty( Magnifier::Property::FRAME_VISIBILITY, false );
-  DALI_TEST_EQUALS( view.GetProperty( Magnifier::Property::FRAME_VISIBILITY ).Get< bool >(), false, TEST_LOCATION );
+  view.SetProperty(Magnifier::Property::FRAME_VISIBILITY, false);
+  DALI_TEST_EQUALS(view.GetProperty(Magnifier::Property::FRAME_VISIBILITY).Get<bool>(), false, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( view.GetProperty( Magnifier::Property::FRAME_VISIBILITY ).Get< bool >(), false, TEST_LOCATION );
+  DALI_TEST_EQUALS(view.GetProperty(Magnifier::Property::FRAME_VISIBILITY).Get<bool>(), false, TEST_LOCATION);
 
-  view.SetProperty( Magnifier::Property::FRAME_VISIBILITY, true );
-  DALI_TEST_EQUALS( view.GetProperty( Magnifier::Property::FRAME_VISIBILITY ).Get< bool >(), true, TEST_LOCATION );
+  view.SetProperty(Magnifier::Property::FRAME_VISIBILITY, true);
+  DALI_TEST_EQUALS(view.GetProperty(Magnifier::Property::FRAME_VISIBILITY).Get<bool>(), true, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( view.GetProperty( Magnifier::Property::FRAME_VISIBILITY ).Get< bool >(), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(view.GetProperty(Magnifier::Property::FRAME_VISIBILITY).Get<bool>(), true, TEST_LOCATION);
 
   END_TEST;
 }
@@ -196,33 +196,33 @@ int UtcDaliMagnifierMagnificationFactor(void)
 {
   ToolkitTestApplication application;
 
-  Stage stage = Stage::GetCurrent();
+  Integration::Scene stage = application.GetScene();
 
   Magnifier view = Magnifier::New();
-  stage.Add( view );
+  stage.Add(view);
 
   application.SendNotification();
   application.Render();
 
-  float magnificationFactor( 200.0f );
+  float magnificationFactor(200.0f);
 
-  DALI_TEST_CHECK( view.GetProperty( Magnifier::Property::MAGNIFICATION_FACTOR ).Get< float >() != magnificationFactor );
+  DALI_TEST_CHECK(view.GetProperty(Magnifier::Property::MAGNIFICATION_FACTOR).Get<float>() != magnificationFactor);
 
-  view.SetProperty( Magnifier::Property::MAGNIFICATION_FACTOR, magnificationFactor );
-  DALI_TEST_EQUALS( view.GetProperty( Magnifier::Property::MAGNIFICATION_FACTOR ).Get< float >(), magnificationFactor, TEST_LOCATION );
+  view.SetProperty(Magnifier::Property::MAGNIFICATION_FACTOR, magnificationFactor);
+  DALI_TEST_EQUALS(view.GetProperty(Magnifier::Property::MAGNIFICATION_FACTOR).Get<float>(), magnificationFactor, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( view.GetProperty( Magnifier::Property::MAGNIFICATION_FACTOR ).Get< float >(), magnificationFactor, TEST_LOCATION );
+  DALI_TEST_EQUALS(view.GetProperty(Magnifier::Property::MAGNIFICATION_FACTOR).Get<float>(), magnificationFactor, TEST_LOCATION);
 
-  view.SetProperty( Magnifier::Property::MAGNIFICATION_FACTOR, 1.0f );
-  DALI_TEST_EQUALS( view.GetProperty( Magnifier::Property::MAGNIFICATION_FACTOR ).Get< float >(), 1.0f, TEST_LOCATION );
+  view.SetProperty(Magnifier::Property::MAGNIFICATION_FACTOR, 1.0f);
+  DALI_TEST_EQUALS(view.GetProperty(Magnifier::Property::MAGNIFICATION_FACTOR).Get<float>(), 1.0f, TEST_LOCATION);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( view.GetProperty( Magnifier::Property::MAGNIFICATION_FACTOR ).Get< float >(), 1.0f, TEST_LOCATION );
+  DALI_TEST_EQUALS(view.GetProperty(Magnifier::Property::MAGNIFICATION_FACTOR).Get<float>(), 1.0f, TEST_LOCATION);
 
   END_TEST;
 }
@@ -231,27 +231,27 @@ int UtcDaliMagnifierSourcePosition(void)
 {
   ToolkitTestApplication application;
 
-  Stage stage = Stage::GetCurrent();
+  Integration::Scene stage = application.GetScene();
 
   Magnifier view = Magnifier::New();
-  stage.Add( view );
+  stage.Add(view);
 
   application.SendNotification();
   application.Render();
 
-  Vector3 position( 100.0f, 200.0f, 300.0f );
+  Vector3 position(100.0f, 200.0f, 300.0f);
 
-  DALI_TEST_CHECK( view.GetProperty( Magnifier::Property::SOURCE_POSITION ).Get< Vector3 >() != position );
+  DALI_TEST_CHECK(view.GetProperty(Magnifier::Property::SOURCE_POSITION).Get<Vector3>() != position);
 
-  view.SetProperty( Magnifier::Property::SOURCE_POSITION, position );
+  view.SetProperty(Magnifier::Property::SOURCE_POSITION, position);
   application.SendNotification();
   application.Render();
-  DALI_TEST_EQUALS( view.GetProperty( Magnifier::Property::SOURCE_POSITION ).Get< Vector3 >(), position, TEST_LOCATION );
+  DALI_TEST_EQUALS(view.GetProperty(Magnifier::Property::SOURCE_POSITION).Get<Vector3>(), position, TEST_LOCATION);
 
-  view.SetProperty( Magnifier::Property::SOURCE_POSITION, Vector3::ONE );
+  view.SetProperty(Magnifier::Property::SOURCE_POSITION, Vector3::ONE);
   application.SendNotification();
   application.Render();
-  DALI_TEST_EQUALS( view.GetProperty( Magnifier::Property::SOURCE_POSITION ).Get< Vector3 >(), Vector3::ONE, TEST_LOCATION );
+  DALI_TEST_EQUALS(view.GetProperty(Magnifier::Property::SOURCE_POSITION).Get<Vector3>(), Vector3::ONE, TEST_LOCATION);
 
   END_TEST;
 }
@@ -262,18 +262,18 @@ int UtcDaliMagnifierOnSizeSet(void)
 
   Magnifier view = Magnifier::New();
 
-  Stage::GetCurrent().Add( view );
+  application.GetScene().Add(view);
 
   application.SendNotification();
   application.Render();
 
-  Vector3 size( 200.0f, 300.0f, 0.0f );
-  view.SetSize( size );
+  Vector3 size(200.0f, 300.0f, 0.0f);
+  view.SetProperty(Actor::Property::SIZE, size);
 
   application.SendNotification();
   application.Render();
 
-  DALI_TEST_EQUALS( view.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ), size, TEST_LOCATION );
+  DALI_TEST_EQUALS(view.GetCurrentProperty<Vector3>(Actor::Property::SIZE), size, TEST_LOCATION);
 
   END_TEST;
 }