X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali%2Futc-Dali-EncodedBufferImage.cpp;h=aef53e8ff8d38238e6ad4f86a814893dd0bfd9a9;hb=ff364987bf3c2ef5bb2b57348747eeb784d8ba90;hp=784d45b89b4b5b3186fc4f753ab56d6fa3bb1b3e;hpb=f47a49768010de60f06c22065ad3f293f019046a;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/automated-tests/src/dali/utc-Dali-EncodedBufferImage.cpp b/automated-tests/src/dali/utc-Dali-EncodedBufferImage.cpp
index 784d45b..aef53e8 100644
--- 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.
@@ -758,13 +758,52 @@ static const unsigned int sEncodedBufferImageDataPNGLength = sizeof( sEncodedBuf
 } // anonymous namespace
 
 
+int UtcDaliEncodedBufferImageCtorsP(void)
+{
+  TestApplication application;
+
+  EncodedBufferImage image1;
+  DALI_TEST_CHECK( !image1 );
+
+  image1 = EncodedBufferImage::New( sEncodedBufferImageDataPNG, sEncodedBufferImageDataPNGLength, ImageDimensions(), FittingMode::DEFAULT, SamplingMode::DEFAULT );
+  EncodedBufferImage image2( image1 );
+
+  DALI_TEST_EQUALS( image1, image2, TEST_LOCATION );
+  END_TEST;
+}
+
+int UtcDaliEncodedBufferImageOperatorAssignmentP(void)
+{
+  TestApplication application;
+
+  EncodedBufferImage image1;
+  DALI_TEST_CHECK( !image1 );
+
+  image1 = EncodedBufferImage::New( sEncodedBufferImageDataPNG, sEncodedBufferImageDataPNGLength, ImageDimensions(), FittingMode::DEFAULT, SamplingMode::DEFAULT );
+  EncodedBufferImage image2;
+  image2 = image1;
+
+  DALI_TEST_EQUALS( image1, image2, TEST_LOCATION );
+  END_TEST;
+}
+
+int UtcDaliEncodedBufferImageDownCastP(void)
+{
+  TestApplication application;
+
+  Image image1 = EncodedBufferImage::New( sEncodedBufferImageDataPNG, sEncodedBufferImageDataPNGLength, ImageDimensions(), FittingMode::DEFAULT, SamplingMode::DEFAULT );
+  EncodedBufferImage image2 = DownCast< EncodedBufferImage >(image1);
+
+  DALI_TEST_EQUALS( image1, image2, TEST_LOCATION );
+  END_TEST;
+}
 
 // Positive test case for constructors:
-int UtcDaliEncodedBufferImageNew01(void)
+int UtcDaliEncodedBufferImageNewP1(void)
 {
   TestApplication application;
 
-  tet_infoline("UtcDaliEncodedBufferImageNew01() - EncodedBufferImage::New( const uint8_t * const encodedImage, const std::size_t encodedImageByteCount, const ImageAttributes& attributes, const ReleasePolicy releasePol )");
+  tet_infoline( "UtcDaliEncodedBufferImageNew01() - EncodedBufferImage::New( const uint8_t * const encodedImage, const std::size_t encodedImageByteCount, ImageDimensions size, FittingMode::Type scalingMode, SamplingMode::Type samplingMode, ReleasePolicy releasePol, bool orientationCorrection )" );
 
   // Invoke default handle constructor for the Image base class:
   Image image;
@@ -772,31 +811,46 @@ int UtcDaliEncodedBufferImageNew01(void)
   DALI_TEST_CHECK( !image );
 
   // Trigger image decode to initialise the handle
-  Dali::ImageAttributes imageAttributes;
-  imageAttributes.SetSize( 720, 1280 );
-  imageAttributes.SetScalingMode( Dali::ImageAttributes::FitHeight );
-  image = EncodedBufferImage::New( sEncodedBufferImageDataPNG, sEncodedBufferImageDataPNGLength, imageAttributes, Image::NEVER );
+  image = EncodedBufferImage::New( sEncodedBufferImageDataPNG, sEncodedBufferImageDataPNGLength, ImageDimensions(), FittingMode::DEFAULT, SamplingMode::DEFAULT );
 
   DALI_TEST_CHECK( image );
 
-  // Change the release policy to Unused:
-  Image image2;
+  END_TEST;
+}
 
-  DALI_TEST_CHECK( !image2 );
+// Positive test case for constructors:
+int UtcDaliEncodedBufferImageNewP2(void)
+{
+  TestApplication application;
+
+  tet_infoline( "UtcDaliEncodedBufferImageNew01() - EncodedBufferImage::New( const uint8_t * const encodedImage, const std::size_t encodedImageByteCount, ImageDimensions size, FittingMode::Type scalingMode, SamplingMode::Type samplingMode, ReleasePolicy releasePol, bool orientationCorrection )" );
 
+  // Invoke default handle constructor for the Image base class:
+  Image image;
+
+  DALI_TEST_CHECK( !image );
+
+  // Trigger image decode to initialise the handle
+  image = EncodedBufferImage::New( sEncodedBufferImageDataPNG, sEncodedBufferImageDataPNGLength, ImageDimensions(), FittingMode::DEFAULT, SamplingMode::DEFAULT );
+
+  DALI_TEST_CHECK( image );
+
+  Image image2;
+  DALI_TEST_CHECK( !image2 );
   // Trigger image decode to initialise the handle
-  image2 = EncodedBufferImage::New( sEncodedBufferImageDataPNG, sEncodedBufferImageDataPNGLength, imageAttributes, Image::UNUSED );
+  image2 = EncodedBufferImage::New( sEncodedBufferImageDataPNG, sEncodedBufferImageDataPNGLength);
 
   DALI_TEST_CHECK( image2 );
   END_TEST;
 }
 
+
 // Negative test case for constructor - null pointer:
-int UtcDaliEncodedBufferImageNew02(void)
+int UtcDaliEncodedBufferImageNewN1(void)
 {
   TestApplication application;
 
-  tet_infoline("UtcDaliEncodedBufferImageNew02() - EncodedBufferImage::New( const uint8_t * const encodedImage, const std::size_t encodedImageByteCount, const ImageAttributes& attributes, const ReleasePolicy releasePol )");
+  tet_infoline( "UtcDaliEncodedBufferImageNew02() - EncodedBufferImage::New( const uint8_t * const encodedImage, const std::size_t encodedImageByteCount )" );
 
   // Invoke default handle constructor for the Image base class:
   Image image;
@@ -804,30 +858,26 @@ int UtcDaliEncodedBufferImageNew02(void)
   DALI_TEST_CHECK( !image );
 
   // Trigger image decode to initialise the handle
-  Dali::ImageAttributes imageAttributes;
-  imageAttributes.SetSize( 720, 1280 );
-  imageAttributes.SetScalingMode( Dali::ImageAttributes::FitHeight );
   try
   {
     // This should throw on the null pointer:
-    image = EncodedBufferImage::New( 0, sEncodedBufferImageDataPNGLength, imageAttributes, Image::NEVER );
+    image = EncodedBufferImage::New( 0, sEncodedBufferImageDataPNGLength );
     tet_result( TET_FAIL );
   }
   catch (Dali::DaliException& e)
   {
     // Tests that a negative test of an assertion succeeds
     DALI_TEST_PRINT_ASSERT( e );
-    DALI_TEST_ASSERT(e, "encodedImage && \"Null image pointer passed-in for decoding from memory.\"", TEST_LOCATION);
   }
   END_TEST;
 }
 
 // Negative test case for constructor - zero-length input buffer:
-int UtcDaliEncodedBufferImageNew03(void)
+int UtcDaliEncodedBufferImageNewN2(void)
 {
   TestApplication application;
 
-  tet_infoline("UtcDaliEncodedBufferImageNew03() - EncodedBufferImage::New( const uint8_t * const encodedImage, const std::size_t encodedImageByteCount, const ImageAttributes& attributes, const ReleasePolicy releasePol )");
+  tet_infoline( "UtcDaliEncodedBufferImageNew03() - EncodedBufferImage::New( const uint8_t * const encodedImage, const std::size_t encodedImageByteCount )" );
 
   // Invoke default handle constructor for the Image base class:
   Image image;
@@ -835,18 +885,16 @@ int UtcDaliEncodedBufferImageNew03(void)
   DALI_TEST_CHECK( !image );
 
   // Trigger image decode to initialise the handle
-  Dali::ImageAttributes imageAttributes;
   try
   {
     // This should throw on the zero size:
-    image = EncodedBufferImage::New( sEncodedBufferImageDataPNG, /** Trigger the assertion.*/ 0, imageAttributes, Image::NEVER );
+    image = EncodedBufferImage::New( sEncodedBufferImageDataPNG, /** Trigger the assertion.*/ 0 );
     tet_result( TET_FAIL );
   }
   catch (Dali::DaliException& e)
   {
     // Tests that a negative test of an assertion succeeds
     DALI_TEST_PRINT_ASSERT( e );
-    DALI_TEST_ASSERT(e, "encodedImageByteCount > 0U && \"Zero size passed for image resource in memory buffer.\"", TEST_LOCATION);
   }
   END_TEST;
 }