From: David Steele <david.steele@samsung.com>
Date: Wed, 2 Mar 2016 20:16:48 +0000 (+0000)
Subject: Fixing test cases after Texture::Bind cleanup.
X-Git-Tag: dali_1.1.25~1
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=2ef98a4dea6b192fccf9b43ca6405d46ff832d7b;ds=sidebyside

Fixing test cases after Texture::Bind cleanup.

Some test cases were expecting a texture to be rendered, but weren't providing
pixel data. With the cleanup to Texture::Bind preventing a call to glBindTexture
without pixel data, this is no longer the case.

Added dummy pixel data to ensure the test cases pass.

Change-Id: I67268b3a4a9446ff5745bc43f7f9f67f13c5ff69
Signed-off-by: David Steele <david.steele@samsung.com>
---

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-RendererFactory.cpp b/automated-tests/src/dali-toolkit/utc-Dali-RendererFactory.cpp
index 2d30cd8..dd7012d 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-RendererFactory.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-RendererFactory.cpp
@@ -531,9 +531,16 @@ int UtcDaliRendererFactoryGetImageRenderer1(void)
   Actor actor = Actor::New();
   // For tesing the LoadResourceFunc is called, a big image size should be set, so the atlasing is not applied.
   // Image with a size smaller than 512*512 will be uploaded as a part of the atlas.
+
+  const int width=512;
+  const int height=513;
+
+  Integration::Bitmap* bitmap = Integration::Bitmap::New( Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::OWNED_DISCARD );
+  bitmap->GetPackedPixelsProfile()->ReserveBuffer( Pixel::RGBA8888, width, height,width, height );
+
   TestControlRendererRender( application, actor, controlRenderer, 1u,
-                             ImageDimensions(512, 513),
-                             Integration::ResourcePointer(Integration::Bitmap::New(Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::OWNED_DISCARD)));
+                             ImageDimensions(width, height),
+                             Integration::ResourcePointer( bitmap ) );
 
   TestGlAbstraction& gl = application.GetGlAbstraction();
   int textureUnit = -1;
@@ -560,9 +567,16 @@ int UtcDaliRendererFactoryGetImageRenderer2(void)
   Actor actor = Actor::New();
   // For tesing the LoadResourceFunc is called, a big image size should be set, so the atlasing is not applied.
   // Image with a size smaller than 512*512 will be uploaded as a part of the atlas.
+
+  const int width=512;
+  const int height=513;
+
+  Integration::Bitmap* bitmap = Integration::Bitmap::New( Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::OWNED_DISCARD );
+  bitmap->GetPackedPixelsProfile()->ReserveBuffer( Pixel::RGBA8888, width, height,width, height );
+
   TestControlRendererRender( application, actor, controlRenderer, 1u,
-                             ImageDimensions(512, 513),
-                             Integration::ResourcePointer(Integration::Bitmap::New(Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::OWNED_DISCARD)) );
+                             ImageDimensions(width, height),
+                             Integration::ResourcePointer(bitmap) );
 
   TestGlAbstraction& gl = application.GetGlAbstraction();
   int textureUnit = -1;
@@ -775,10 +789,13 @@ int UtcDaliRendererFactoryGetNPatchRendererN1(void)
   DALI_TEST_CHECK( controlRenderer );
 
   Actor actor = Actor::New();
+
   //The testkit still has to load a bitmap for the broken renderer image
+  Integration::Bitmap* bitmap = Integration::Bitmap::New(Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::OWNED_DISCARD);
+  bitmap->GetPackedPixelsProfile()->ReserveBuffer( Pixel::RGBA8888, 100, 100, 100, 100 );
   TestControlRendererRender( application, actor, controlRenderer, 1u,
                              ImageDimensions(),
-                             Integration::ResourcePointer(Integration::Bitmap::New(Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::OWNED_DISCARD)) );
+                             Integration::ResourcePointer(bitmap) );
 
   TestGlAbstraction& gl = application.GetGlAbstraction();
   int textureUnit = -1;
@@ -806,10 +823,13 @@ int UtcDaliRendererFactoryGetNPatchRendererN2(void)
   DALI_TEST_CHECK( controlRenderer );
 
   Actor actor = Actor::New();
+
   //The testkit still has to load a bitmap for the broken renderer image
+  Integration::Bitmap* bitmap = Integration::Bitmap::New(Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::OWNED_DISCARD);
+  bitmap->GetPackedPixelsProfile()->ReserveBuffer( Pixel::RGBA8888, 100, 100, 100, 100 );
   TestControlRendererRender( application, actor, controlRenderer, 1u,
                              ImageDimensions(),
-                             Integration::ResourcePointer(Integration::Bitmap::New(Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::OWNED_DISCARD)) );
+                             Integration::ResourcePointer(bitmap) );
 
   TestGlAbstraction& gl = application.GetGlAbstraction();
   int textureUnit = -1;