Merge "Ensure Animatable component properties can be animated" into devel/master

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

diff --git a/automated-tests/src/dali/utc-Dali-EncodedBufferImage.cpp b/automated-tests/src/dali/utc-Dali-EncodedBufferImage.cpp
index 8586b61..922400c 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-EncodedBufferImage.cpp
+++ b/automated-tests/src/dali/utc-Dali-EncodedBufferImage.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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.
@@ -755,6 +755,15 @@ const unsigned char sEncodedBufferImageDataPNG[] = {
 
 static const unsigned int sEncodedBufferImageDataPNGLength = sizeof( sEncodedBufferImageDataPNG );
 
+void PrepareDecodeBuffer( TestApplication& application, unsigned int width, unsigned int height, Pixel::Format pixelFormat )
+{
+  TestPlatformAbstraction& platform = application.GetPlatform();
+  Integration::Bitmap* bitmap = Integration::Bitmap::New( Integration::Bitmap::BITMAP_2D_PACKED_PIXELS, ResourcePolicy::OWNED_RETAIN );
+  bitmap->GetPackedPixelsProfile()->ReserveBuffer( pixelFormat, width, height, width, height );
+  Integration::BitmapPtr bitmapPtr(bitmap);
+  platform.SetDecodedBitmap( bitmapPtr );
+}
+
 } // anonymous namespace
 
 
@@ -765,7 +774,7 @@ int UtcDaliEncodedBufferImageCtorsP(void)
   EncodedBufferImage image1;
   DALI_TEST_CHECK( !image1 );
 
-  image1 = EncodedBufferImage::New( sEncodedBufferImageDataPNG, sEncodedBufferImageDataPNGLength, ImageDimensions(), FittingMode::DEFAULT, SamplingMode::DEFAULT, Image::NEVER );
+  image1 = EncodedBufferImage::New( sEncodedBufferImageDataPNG, sEncodedBufferImageDataPNGLength, ImageDimensions(), FittingMode::DEFAULT, SamplingMode::DEFAULT );
   EncodedBufferImage image2( image1 );
 
   DALI_TEST_EQUALS( image1, image2, TEST_LOCATION );
@@ -779,7 +788,7 @@ int UtcDaliEncodedBufferImageOperatorAssignmentP(void)
   EncodedBufferImage image1;
   DALI_TEST_CHECK( !image1 );
 
-  image1 = EncodedBufferImage::New( sEncodedBufferImageDataPNG, sEncodedBufferImageDataPNGLength, ImageDimensions(), FittingMode::DEFAULT, SamplingMode::DEFAULT, Image::NEVER );
+  image1 = EncodedBufferImage::New( sEncodedBufferImageDataPNG, sEncodedBufferImageDataPNGLength, ImageDimensions(), FittingMode::DEFAULT, SamplingMode::DEFAULT );
   EncodedBufferImage image2;
   image2 = image1;
 
@@ -791,7 +800,7 @@ int UtcDaliEncodedBufferImageDownCastP(void)
 {
   TestApplication application;
 
-  Image image1 = EncodedBufferImage::New( sEncodedBufferImageDataPNG, sEncodedBufferImageDataPNGLength, ImageDimensions(), FittingMode::DEFAULT, SamplingMode::DEFAULT, Image::NEVER );
+  Image image1 = EncodedBufferImage::New( sEncodedBufferImageDataPNG, sEncodedBufferImageDataPNGLength, ImageDimensions(), FittingMode::DEFAULT, SamplingMode::DEFAULT );
   EncodedBufferImage image2 = DownCast< EncodedBufferImage >(image1);
 
   DALI_TEST_EQUALS( image1, image2, TEST_LOCATION );
@@ -811,19 +820,10 @@ int UtcDaliEncodedBufferImageNewP1(void)
   DALI_TEST_CHECK( !image );
 
   // Trigger image decode to initialise the handle
-  image = EncodedBufferImage::New( sEncodedBufferImageDataPNG, sEncodedBufferImageDataPNGLength, ImageDimensions(), FittingMode::DEFAULT, SamplingMode::DEFAULT, Image::NEVER );
+  image = EncodedBufferImage::New( sEncodedBufferImageDataPNG, sEncodedBufferImageDataPNGLength, ImageDimensions(), FittingMode::DEFAULT, SamplingMode::DEFAULT );
 
   DALI_TEST_CHECK( image );
 
-  // Change the release policy to Unused:
-  Image image2;
-
-  DALI_TEST_CHECK( !image2 );
-
-  // Trigger image decode to initialise the handle
-  image2 = EncodedBufferImage::New( sEncodedBufferImageDataPNG, sEncodedBufferImageDataPNGLength, ImageDimensions(), FittingMode::DEFAULT, SamplingMode::DEFAULT, Image::UNUSED );
-
-  DALI_TEST_CHECK( image2 );
   END_TEST;
 }
 
@@ -840,6 +840,7 @@ int UtcDaliEncodedBufferImageNewP2(void)
   DALI_TEST_CHECK( !image );
 
   // Trigger image decode to initialise the handle
+  PrepareDecodeBuffer( application, 720u, 1280u, Pixel::RGBA8888 );
   image = EncodedBufferImage::New( sEncodedBufferImageDataPNG, sEncodedBufferImageDataPNGLength, ImageDimensions(), FittingMode::DEFAULT, SamplingMode::DEFAULT );
 
   DALI_TEST_CHECK( image );