Fixed some TCT issues

Change-Id: I056f3d557da30f6b53ac670e754725fef012d245

diff --git a/automated-tests/src/dali/CMakeLists.txt b/automated-tests/src/dali/CMakeLists.txt
index 0a6c945..9e2f031 100644 (file)
--- a/automated-tests/src/dali/CMakeLists.txt
+++ b/automated-tests/src/dali/CMakeLists.txt
@@ -29,7 +29,6 @@ SET(TC_SOURCES
         utc-Dali-DynamicsWorld.cpp
         utc-Dali-DynamicsWorldConfig.cpp
         utc-Dali-EncodedBufferImage.cpp
-        utc-Dali-FixedSizeMemoryPool.cpp
         utc-Dali-FrameBufferImage.cpp
         utc-Dali-Gesture.cpp
         utc-Dali-GestureDetector.cpp

diff --git a/automated-tests/src/dali/utc-Dali-Layer.cpp b/automated-tests/src/dali/utc-Dali-Layer.cpp
index 69a19d7..5c6d1b8 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Layer.cpp
+++ b/automated-tests/src/dali/utc-Dali-Layer.cpp
@@ -547,7 +547,8 @@ int UtcDaliLayerClippingGLCalls(void)
   layer.SetClippingBox( testBox );
 
   // Add at least one renderable actor so the GL calls are actually made
-  Actor actor = ImageActor::New();
+  BufferImage img = BufferImage::New( 1,1 );
+  Actor actor = ImageActor::New( img );
   stage.Add( actor );
 
   // flush the queue and render once

diff --git a/automated-tests/src/dali/utc-Dali-ObjectRegistry.cpp b/automated-tests/src/dali/utc-Dali-ObjectRegistry.cpp
index 6c506c9..ea8ac3c 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-ObjectRegistry.cpp
+++ b/automated-tests/src/dali/utc-Dali-ObjectRegistry.cpp
@@ -145,25 +145,6 @@ struct TestMeshActorCallback
   bool& mSignalVerified;
 };
 
-
-struct TestTextActorCallback
-{
-  TestTextActorCallback(bool& signalReceived)
-  : mSignalVerified(signalReceived)
-  {
-  }
-  void operator()(BaseHandle object)
-  {
-    tet_infoline("Verifying TestTextActorCallback()");
-    TextActor actor = TextActor::DownCast(object);
-    if(actor)
-    {
-      mSignalVerified = true;
-    }
-  }
-  bool& mSignalVerified;
-};
-
 struct TestAnimationCallback
 {
   TestAnimationCallback(bool& signalReceived)

diff --git a/automated-tests/src/dali/utc-Dali-Scripting.cpp b/automated-tests/src/dali/utc-Dali-Scripting.cpp
index adfd3f2..e663bc8 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Scripting.cpp
+++ b/automated-tests/src/dali/utc-Dali-Scripting.cpp
@@ -706,13 +706,8 @@ int UtcDaliScriptingNewActorChildren(void)
   child1Map[ "type" ] = "ImageActor";
   child1Map[ "position" ] = Vector3::YAXIS;
 
-  Property::Map child2Map;
-  child2Map[ "type" ] = "TextActor";
-  child2Map[ "position" ] = Vector3::ZAXIS;
-
   Property::Array childArray;
   childArray.push_back( child1Map );
-  childArray.push_back( child2Map );
   map[ "actors" ] = childArray;
 
   // Create
@@ -724,7 +719,7 @@ int UtcDaliScriptingNewActorChildren(void)
   application.Render();
 
   DALI_TEST_EQUALS( handle.GetCurrentPosition(), Vector3::XAXIS, TEST_LOCATION );
-  DALI_TEST_EQUALS( handle.GetChildCount(), 2u, TEST_LOCATION );
+  DALI_TEST_EQUALS( handle.GetChildCount(), 1u, TEST_LOCATION );
 
   Actor child1 = handle.GetChildAt(0);
   DALI_TEST_CHECK( child1 );
@@ -732,12 +727,6 @@ int UtcDaliScriptingNewActorChildren(void)
   DALI_TEST_EQUALS( child1.GetCurrentPosition(), Vector3::YAXIS, TEST_LOCATION );
   DALI_TEST_EQUALS( child1.GetChildCount(), 0u, TEST_LOCATION );
 
-  Actor child2 = handle.GetChildAt(1);
-  DALI_TEST_CHECK( child2 );
-  DALI_TEST_CHECK( TextActor::DownCast( child2 ) );
-  DALI_TEST_EQUALS( child2.GetCurrentPosition(), Vector3::ZAXIS, TEST_LOCATION );
-  DALI_TEST_EQUALS( child2.GetChildCount(), 0u, TEST_LOCATION );
-
   Stage::GetCurrent().Remove( handle );
   END_TEST;
 }