[UTC/ITC][dali-core][Non-ACR][Fix to use new RenderTask instead of default RenderTask]

Change-Id: I91d10555b083e807d8e334f708db6fd39cf86ac5
Signed-off-by: Seungho, Baek <sbsh.baek@samsung.com>

diff --git a/src/itc/dali-core/render-task/ITs-render-task-impl.h b/src/itc/dali-core/render-task/ITs-render-task-impl.h
index d5a707dc44fdef77c7a29f16561eda471b793267..11cd0edbd1c67974e0ceff701447de242449cdcb 100755 (executable)
--- a/src/itc/dali-core/render-task/ITs-render-task-impl.h
+++ b/src/itc/dali-core/render-task/ITs-render-task-impl.h
@@ -459,39 +459,37 @@ void RenderTaskSetGetClearEnabled()
 void RenderTaskSetGetViewportPosition()
 {
        const float F_X = 25.0f, F_Y = 50.0f;
-       Stage stage;
-       RenderTaskList renderTaskList;
-    DALI_CHECK_FAIL(!RenderTaskinit(stage, renderTaskList, g_renderTask),  "RenderTask Initialization Failed " );
+  DALI_CHECK_FAIL(!RenderTaskConstruction( g_renderTask ),  "RenderTask Initialization Failed " );
 
        Vector2 vec2SetPosition(F_X, F_Y);
        g_vector_2=vec2SetPosition;
        g_renderTask.SetViewportPosition(vec2SetPosition);
 }
+
 void VTRenderTaskSetGetViewportPosition001()
 {
-    Vector2 vec2GetPosition = g_renderTask.GetCurrentViewportPosition();
+  Vector2 vec2GetPosition = g_renderTask.GetCurrentViewportPosition();
 
-    std::stringstream out;
-    out << "SetViewportPosition and GetCurrentViewportPosition is not matched: " << vec2GetPosition.x << ", " << vec2GetPosition.y;
+  std::stringstream out;
+  out << "SetViewportPosition and GetCurrentViewportPosition is not matched: " << vec2GetPosition.x << ", " << vec2GetPosition.y;
 
-       DALI_CHECK_FAIL(vec2GetPosition != g_vector_2, out.str().c_str());
-       
-    DaliLog::PrintPass(); 
+  DALI_CHECK_FAIL(vec2GetPosition != g_vector_2, out.str().c_str());
+
+  DaliLog::PrintPass();
 }
 
 void RenderTaskSetAndGetViewport()
 {
-       const float F_X = 0.0f, F_Y = 0.0f, F_WIDTH = 100.0f, F_HEIGHT = 50.0f;    
-       Stage stage;
-       RenderTaskList renderTaskList;
-    DALI_CHECK_FAIL(!RenderTaskinit(stage, renderTaskList, g_renderTask),  "RenderTask Initialization Failed " );
-
-       Viewport viewportDefault = g_renderTask.GetViewport();
-       Viewport viewportExpected(0, 0, stage.GetSize().width, stage.GetSize().height);
-       DALI_CHECK_FAIL(viewportExpected != viewportDefault,  " default viewport is mismatched with expected viewport");
+       const float F_X = 0.0f, F_Y = 0.0f, F_WIDTH = 100.0f, F_HEIGHT = 50.0f;
+  DALI_CHECK_FAIL(!RenderTaskConstruction( g_renderTask ),  "RenderTask Initialization Failed " );
+ 
+  Stage stage = Stage::GetCurrent();
+  Viewport viewportDefault = g_renderTask.GetViewport();
+  Viewport viewportExpected(0, 0, stage.GetSize().width, stage.GetSize().height);
+  DALI_CHECK_FAIL(viewportExpected != viewportDefault,  " default viewport is mismatched with expected viewport");
 
-       g_viewportSet=Viewport(F_X, F_Y, F_WIDTH, F_HEIGHT);
-    g_renderTask.SetViewport(g_viewportSet);
+  g_viewportSet=Viewport(F_X, F_Y, F_WIDTH, F_HEIGHT);
+  g_renderTask.SetViewport(g_viewportSet);
 }
 void VTRenderTaskSetGetViewport001()
 {

diff --git a/src/utc/dali-core/render-task/utc-dali-render-task-impl.h b/src/utc/dali-core/render-task/utc-dali-render-task-impl.h
index fa57f412777caa764c6d7776f955150e926ef22f..3005e9e9f65f524cab09bcee7ff3be5d675fe3e9 100755 (executable)
--- a/src/utc/dali-core/render-task/utc-dali-render-task-impl.h
+++ b/src/utc/dali-core/render-task/utc-dali-render-task-impl.h
@@ -578,9 +578,7 @@ void RenderTaskGetClearEnabledN()
 void RenderTaskSetGetViewportPositionP()
 {
   const float F_X = 25.0f, F_Y = 50.0f;
-  Stage stage;
-  RenderTaskList renderTaskList;
-  DALI_CHECK_FAIL(!RenderTaskinit(stage, renderTaskList, gRenderTask),  "RenderTask Initialization Failed " );
+  DALI_CHECK_FAIL(!RenderTaskConstruction( gRenderTask ),  "RenderTask Initialization Failed " );
 
   Vector2 vec2SetPosition(F_X, F_Y);
   gVector2=vec2SetPosition;
@@ -602,10 +600,9 @@ void VTRenderTaskSetGetViewportPosition001()
 void RenderTaskSetAndGetViewportP()
 {
   const float F_X = 0.0f, F_Y = 0.0f, F_WIDTH = 100.0f, F_HEIGHT = 50.0f;
-  Stage stage;
-  RenderTaskList renderTaskList;
-  DALI_CHECK_FAIL(!RenderTaskinit(stage, renderTaskList, gRenderTask),  "RenderTask Initialization Failed " );
+  DALI_CHECK_FAIL(!RenderTaskConstruction( gRenderTask ),  "RenderTask Initialization Failed " );
 
+  Stage stage = Stage::GetCurrent();
   Viewport viewportDefault = gRenderTask.GetViewport();
   Viewport viewportExpected(0, 0, stage.GetSize().width, stage.GetSize().height);
   DALI_CHECK_FAIL(viewportExpected != viewportDefault,  " default viewport is mismatched with expected viewport");