support string_view in DALI_TEST_EQUALS

[platform/core/uifw/dali-toolkit.git] / automated-tests / src / dali-toolkit / utc-Dali-ImageAtlas.cpp

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ImageAtlas.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ImageAtlas.cpp
index b605fc4..25d83ba 100644 (file)
--- 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) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -276,7 +276,7 @@ int UtcDaliImageAtlasUploadP(void)
 
 int UtcDaliImageAtlasUploadWithObserver01(void)
 {
-  TestApplication application;
+  ToolkitTestApplication application;
   ImageAtlas atlas = ImageAtlas::New( 200, 200 );
 
 
@@ -303,7 +303,7 @@ int UtcDaliImageAtlasUploadWithObserver01(void)
 
 int UtcDaliImageAtlasUploadWithObserver02(void)
 {
-  TestApplication application;
+  ToolkitTestApplication application;
   ImageAtlas atlas = ImageAtlas::New( 200, 200 );
 
   gCountOfTestFuncCall = 0;
@@ -333,7 +333,7 @@ int UtcDaliImageAtlasUploadWithObserver02(void)
 
 int UtcDaliImageAtlasUploadWithObserver03(void)
 {
-  TestApplication application;
+  ToolkitTestApplication application;
 
   gCountOfTestFuncCall = 0;
   TestUploadObserver* uploadObserver = new TestUploadObserver;
@@ -364,7 +364,7 @@ int UtcDaliImageAtlasUploadWithObserver03(void)
 
 int UtcDaliImageAtlasRemove(void)
 {
-  TestApplication application;
+  ToolkitTestApplication application;
   unsigned int size = 100;
   ImageAtlas atlas = ImageAtlas::New( size, size );
   Vector4 textureRect1;
@@ -412,15 +412,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 );
 
@@ -449,7 +449,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 +463,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 );