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-ItemLayout.cpp;h=c1ada40479c18b1181ee5b7d038453162c6e2267;hp=da05a53d22130ac1d11cd5c7bad93e18942fef7a;hb=01777a3489f027123010b281e58efbc9f0a93db7;hpb=06f734a391814a2972e31351604e0a34ef712ed9

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ItemLayout.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ItemLayout.cpp
old mode 100755
new mode 100644
index da05a53..c1ada404
--- a/automated-tests/src/dali-toolkit/utc-Dali-ItemLayout.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ItemLayout.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 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.
@@ -24,8 +24,6 @@
 
 #include <dali.h>
 #include <dali-toolkit/dali-toolkit.h>
-#include <dali-toolkit/devel-api/controls/scrollable/item-view/default-item-layout-property.h>
-
 
 using namespace Dali;
 using namespace Toolkit;
@@ -75,10 +73,7 @@ public: // From ItemFactory
   virtual Actor NewItem(unsigned int itemId)
   {
     // Create a renderable actor for this item
-    Image image = ResourceImage::New( TEST_IMAGE_FILE_NAME );
-    Actor actor = CreateRenderableActor(image);
-
-    return actor;
+    return ImageView::New( TEST_IMAGE_FILE_NAME );
   }
 };
 
@@ -277,11 +272,11 @@ int UtcDaliItemLayoutSetAndGetOrientation(void)
   layout->SetItemSize(itemSize);
 
   Vector3 itemSize1;
-  layout->GetItemSize(0u, Vector3(Stage::GetCurrent().GetSize()), itemSize1);
+  layout->GetItemSize(0u, Vector3(application.GetScene().GetSize()), itemSize1);
 
   DALI_TEST_CHECK(itemSize == itemSize1);
 
-  float position = layout->GetClosestOnScreenLayoutPosition(0, 0.0f, Vector3(Stage::GetCurrent().GetSize()));
+  float position = layout->GetClosestOnScreenLayoutPosition(0, 0.0f, Vector3(application.GetScene().GetSize()));
 
   DALI_TEST_EQUALS(position, 0.0f, TEST_LOCATION);
 
@@ -592,27 +587,15 @@ int UtcDaliItemLayoutSetAndGetLayoutProperties(void)
       DALI_TEST_EQUALS(swipSpeed, 30.0f, TEST_LOCATION );
     }
   }
-  Dali::Stage stage = Dali::Stage::GetCurrent();
-  Vector3 stageSize(stage.GetSize());
-  view.ActivateLayout(0, stageSize, 0.5f);
-  view.ActivateLayout(1, stageSize, 0.5f);
-  view.ActivateLayout(2, stageSize, 0.5f);
+  Dali::Integration::Scene scene = application.GetScene();
+  Vector3 sceneSize(scene.GetSize());
+  view.ActivateLayout(0, sceneSize, 0.5f);
+  view.ActivateLayout(1, sceneSize, 0.5f);
+  view.ActivateLayout(2, sceneSize, 0.5f);
   END_TEST;
 
 }
 
-int UtcDaliItemLayoutSetandGetLayoutChangedFlag(void)
-{
-  ToolkitTestApplication application;
-
-  TestItemLayoutPtr layout = TestItemLayout::New();
-  DALI_TEST_CHECK( layout );
-  layout->ResetLayoutChangedFlag();
-  DALI_TEST_CHECK(layout->HasLayoutChanged() == false);
-
-  END_TEST;
-}
-
 int UtcDaliItemRangeIntersection(void)
 {
   ToolkitTestApplication application;