Removed REQUIRES_STYLE_CHANGE_SIGNALS

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

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 (executable)
new mode 100644 (file)
index 4098d72..c1ada40
--- 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) 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.
@@ -73,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 );
   }
 };
 
@@ -275,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);
 
@@ -590,11 +587,11 @@ 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;
 
 }