X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-ImageAtlas.cpp;h=90af3333285fcaf076c0c48de5b8302d66190dcd;hb=e0a22e262eed4f4ed32fa3f88783e99a3380eb42;hp=848a2821dea8ba8a37afc03ac5b9e8184f51d181;hpb=963a9277aba27b289d604503201775e5fc925bc3;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 848a282..90af333 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) 2015 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2019 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.
@@ -21,9 +21,6 @@
 #include <dali-toolkit-test-suite-utils.h>
 #include <toolkit-event-thread-callback.h>
 #include <dali-toolkit/devel-api/image-loader/image-atlas.h>
-#include <dali-toolkit/devel-api/visuals/image-visual-properties-devel.h>
-
-#include <dali-toolkit/public-api/controls/image-view/image-view.h>
 #include <dali-toolkit/dali-toolkit.h>
 
 using namespace Dali;
@@ -279,7 +276,7 @@ int UtcDaliImageAtlasUploadP(void)
 
 int UtcDaliImageAtlasUploadWithObserver01(void)
 {
-  TestApplication application;
+  ToolkitTestApplication application;
   ImageAtlas atlas = ImageAtlas::New( 200, 200 );
 
 
@@ -306,7 +303,7 @@ int UtcDaliImageAtlasUploadWithObserver01(void)
 
 int UtcDaliImageAtlasUploadWithObserver02(void)
 {
-  TestApplication application;
+  ToolkitTestApplication application;
   ImageAtlas atlas = ImageAtlas::New( 200, 200 );
 
   gCountOfTestFuncCall = 0;
@@ -336,7 +333,7 @@ int UtcDaliImageAtlasUploadWithObserver02(void)
 
 int UtcDaliImageAtlasUploadWithObserver03(void)
 {
-  TestApplication application;
+  ToolkitTestApplication application;
 
   gCountOfTestFuncCall = 0;
   TestUploadObserver* uploadObserver = new TestUploadObserver;
@@ -367,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;
@@ -399,14 +396,14 @@ int UtcDaliImageAtlasImageView(void)
   imageMap1[ ImageVisual::Property::URL ] = gImage_34_RGBA;
   imageMap1[ ImageVisual::Property::DESIRED_HEIGHT ] = 34;
   imageMap1[ ImageVisual::Property::DESIRED_WIDTH ] = 34;
-  imageMap1[ DevelImageVisual::Property::ATLASING] = true;
+  imageMap1[ ImageVisual::Property::ATLASING] = true;
 
   Property::Map imageMap2;
 
   imageMap2[ ImageVisual::Property::URL ] = gImage_50_RGBA;
   imageMap2[ ImageVisual::Property::DESIRED_HEIGHT ] = 50;
   imageMap2[ ImageVisual::Property::DESIRED_WIDTH ] = 50;
-  imageMap2[ DevelImageVisual::Property::ATLASING ] = true;
+  imageMap2[ ImageVisual::Property::ATLASING ] = true;
 
   ImageView imageView1 = ImageView::New();
   imageView1.SetProperty( ImageView::Property::IMAGE, imageMap1 );
@@ -415,8 +412,8 @@ 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 );
 
@@ -460,7 +457,7 @@ int UtcDaliImageAtlasImageView(void)
   imageMap3[ ImageVisual::Property::URL ] = gImage_128_RGB;
   imageMap3[ ImageVisual::Property::DESIRED_HEIGHT ] = 100;
   imageMap3[ ImageVisual::Property::DESIRED_WIDTH ] = 100;
-  imageMap3[ DevelImageVisual::Property::ATLASING ] = true;
+  imageMap3[ ImageVisual::Property::ATLASING ] = true;
 
   ImageView imageView3 = ImageView::New();
   imageView3.SetProperty( ImageView::Property::IMAGE, imageMap3 );