Merge branch 'devel/master' into tizen

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

diff --git a/automated-tests/src/dali/utc-Dali-Context.cpp b/automated-tests/src/dali/utc-Dali-Context.cpp
index bdc5190..0b8e151 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Context.cpp
+++ b/automated-tests/src/dali/utc-Dali-Context.cpp
@@ -27,7 +27,7 @@ using namespace Dali;
 namespace
 {
 // Size of the VertexAttributeArray enables
-// GLES specification states that there's minimum of
+// GLES specification states that there's a minimum of 8
 const unsigned int TEST_MAX_ATTRIBUTE_CACHE_SIZE = 8;
 
 enum TestAttribType
@@ -42,20 +42,13 @@ enum TestAttribType
   ATTRIB_TYPE_LAST
 };
 
-// Create bitmap image
-static BufferImage CreateBufferImage()
+// Create bitmap actor
+static Actor CreateBitmapActor()
 {
   BufferImage image = BufferImage::New(4,4,Pixel::RGBA8888);
-
-  return image;
-}
-
-static ImageActor CreateImageActor()
-{
-  BufferImage image = CreateBufferImage();
-  ImageActor actor = ImageActor::New( image );
+  Actor actor = CreateRenderableActor( image );
   actor.SetSize( 100.0f, 100.0f );
-  actor.SetName("Test ImageActor");
+  actor.SetName("Test Image Rendering Actor");
   return actor;
 }
 
@@ -74,10 +67,6 @@ int UtcDaliContextVertexAttribStartup(void)
   application.Render();
   application.Render();
 
-  // context class should initially set the vertex attrib locations to disable
-  // Make sure it has been modified
-  DALI_TEST_CHECK(application.GetGlAbstraction().GetVertexAttribArrayChanged());
-
   // check the locations
   for (unsigned int i = 0; i < TEST_MAX_ATTRIBUTE_CACHE_SIZE; i++)
   {
@@ -105,9 +94,9 @@ int UtcDaliContextVertexAttribImageRendering(void)
   application.GetGlAbstraction().ClearVertexAttribArrayChanged();
 
 
-  // create a test image actor
-  ImageActor imageActor(CreateImageActor());
-  Stage::GetCurrent().Add(imageActor);
+  // create a test bitmap actor
+  Actor actor(CreateBitmapActor());
+  Stage::GetCurrent().Add(actor);
 
 
   application.SendNotification();