X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-ImageAtlas.cpp;h=9276f505b3de2c27abf000c4fece56bb9e646c5c;hb=ab00a526cf356354ba350ec9539e34a03032f624;hp=04221664d73d243c0b2fb1d6b3e4223af7426a54;hpb=6d96d7c0b6a74a5fe927dcaa2d9b1fae932af08d;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ImageAtlas.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ImageAtlas.cpp
index 0422166..9276f50 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-ImageAtlas.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ImageAtlas.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2019 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 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.
@@ -241,30 +241,32 @@ int UtcDaliImageAtlasUploadP(void)
   DALI_TEST_EQUALS( pixelArea1.height, 34, TEST_LOCATION );
 
   TraceCallStack::NamedParams params;
-  params["width"] = ToString(pixelArea1.width);
-  params["height"] = ToString(pixelArea1.height);
-  params["xoffset"] = ToString(pixelArea1.x);
-  params["yoffset"] = ToString(pixelArea1.y);
+  params["width"] <<pixelArea1.width;
+  params["height"] <<pixelArea1.height;
+  params["xoffset"] <<pixelArea1.x;
+  params["yoffset"] <<pixelArea1.y;
   DALI_TEST_CHECK( callStack.FindMethodAndParams("TexSubImage2D", params ));
 
   Rect<int> pixelArea2 = TextureCoordinateToPixelArea(textureRect2, size);
   DALI_TEST_EQUALS( pixelArea2.width, 50, TEST_LOCATION );
   DALI_TEST_EQUALS( pixelArea2.height, 50, TEST_LOCATION );
 
-  params["width"] = ToString(pixelArea2.width);
-  params["height"] = ToString(pixelArea2.height);
-  params["xoffset"] = ToString(pixelArea2.x);
-  params["yoffset"] = ToString(pixelArea2.y);
+  params.mParams.clear();
+  params["width"] <<pixelArea2.width;
+  params["height"] <<pixelArea2.height;
+  params["xoffset"] <<pixelArea2.x;
+  params["yoffset"] <<pixelArea2.y;
   DALI_TEST_CHECK( callStack.FindMethodAndParams("TexSubImage2D", params ) );
 
   Rect<int> pixelArea3 = TextureCoordinateToPixelArea(textureRect3, size);
   DALI_TEST_EQUALS( pixelArea3.width, 128, TEST_LOCATION );
   DALI_TEST_EQUALS( pixelArea3.height, 128, TEST_LOCATION );
 
-  params["width"] = ToString(pixelArea3.width);
-  params["height"] = ToString(pixelArea3.height);
-  params["xoffset"] = ToString(pixelArea3.x);
-  params["yoffset"] = ToString(pixelArea3.y);
+  params.mParams.clear();
+  params["width"] <<pixelArea3.width;
+  params["height"] <<pixelArea3.height;
+  params["xoffset"] <<pixelArea3.x;
+  params["yoffset"] <<pixelArea3.y;
   DALI_TEST_CHECK( callStack.FindMethodAndParams("TexSubImage2D", params ) );
 
   DALI_TEST_CHECK( ! IsOverlap(pixelArea1, pixelArea2) );
@@ -412,15 +414,15 @@ int UtcDaliImageAtlasImageView(void)
   imageView2.SetProperty( ImageView::Property::IMAGE, imageMap2 );
 
   // ImageView doesn't do size negotiation properly: it only listens to OnSizeSet:
-  imageView1.SetSize( 100, 100 );
-  imageView2.SetSize( 100, 100 );
+  imageView1.SetProperty( Actor::Property::SIZE, Vector2( 100, 100 ) );
+  imageView2.SetProperty( Actor::Property::SIZE, Vector2( 100, 100 ) );
   imageView1.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
   imageView2.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
 
   application.GetPlatform().SetClosestImageSize(  Vector2(34, 34) );
-  Stage::GetCurrent().Add( imageView1 );
+  application.GetScene().Add( imageView1 );
   application.GetPlatform().SetClosestImageSize(  Vector2(50, 50) );
-  Stage::GetCurrent().Add( imageView2 );
+  application.GetScene().Add( imageView2 );
 
   DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 2 ), true, TEST_LOCATION );
 
@@ -430,16 +432,16 @@ int UtcDaliImageAtlasImageView(void)
   callStack.Enable(false);
 
   TraceCallStack::NamedParams params1;
-  params1["width"] = "34";
-  params1["height"] = "34";
-  params1["xoffset"] = "0";
-  params1["yoffset"] = "0";
+  params1["width"] << 34;
+  params1["height"] << 34;
+  params1["xoffset"] << 0;
+  params1["yoffset"] << 0;
 
   TraceCallStack::NamedParams params2;
-  params2["width"] = "50";
-  params2["height"] = "50";
-  params2["xoffset"] = "0";
-  params2["yoffset"] = "34";
+  params2["width"] << 50;
+  params2["height"] << 50;
+  params2["xoffset"] << 0;
+  params2["yoffset"] << 34;
 
   DALI_TEST_EQUALS(  callStack.FindMethodAndParams("TexSubImage2D", params1 ), true, TEST_LOCATION );
   DALI_TEST_EQUALS(  callStack.FindMethodAndParams("TexSubImage2D", params2 ), true, TEST_LOCATION );
@@ -449,7 +451,7 @@ int UtcDaliImageAtlasImageView(void)
 
   // remove the imageView2 from stage, the second image will also be removed from atlas
   // then the space on the atlas will be used by the third image added.
-  Stage::GetCurrent().Remove( imageView2 );
+  application.GetScene().Remove( imageView2 );
   application.SendNotification();
   application.Render(RENDER_FRAME_INTERVAL);
 
@@ -463,7 +465,7 @@ int UtcDaliImageAtlasImageView(void)
   imageView3.SetProperty( ImageView::Property::IMAGE, imageMap3 );
 
   application.GetPlatform().SetClosestImageSize(  Vector2(100, 100) );
-  Stage::GetCurrent().Add( imageView3 );
+  application.GetScene().Add( imageView3 );
 
   DALI_TEST_EQUALS( Test::WaitForEventThreadTrigger( 1 ), true, TEST_LOCATION );
 
@@ -473,10 +475,10 @@ int UtcDaliImageAtlasImageView(void)
   callStack.Enable(false);
 
   TraceCallStack::NamedParams params3;
-  params3["width"] = "100";
-  params3["height"] = "100";
-  params3["xoffset"] = "0";
-  params3["yoffset"] = "34";
+  params3["width"] << 100;
+  params3["height"] << 100;
+  params3["xoffset"] << 0;
+  params3["yoffset"] << 34;
 
   DALI_TEST_EQUALS(  callStack.FindMethodAndParams("TexSubImage2D", params3 ), true, TEST_LOCATION );