Refactoring webp-loading and loader-webp

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

diff --git a/automated-tests/src/dali-adaptor/utc-Dali-GifLoading.cpp b/automated-tests/src/dali-adaptor/utc-Dali-GifLoading.cpp
index 5bd3698..b71cedd 100644 (file)
--- a/automated-tests/src/dali-adaptor/utc-Dali-GifLoading.cpp
+++ b/automated-tests/src/dali-adaptor/utc-Dali-GifLoading.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
@@ -15,10 +15,10 @@
  *
  */
 
-#include <stdlib.h>
-#include <dali/dali.h>
 #include <dali-test-suite-utils.h>
-#include <dali/devel-api/adaptor-framework/gif-loading.h>
+#include <dali/dali.h>
+#include <dali/devel-api/adaptor-framework/animated-image-loading.h>
+#include <stdlib.h>
 
 using namespace Dali;
 
@@ -26,108 +26,42 @@ namespace
 {
 // test gif image, resolution: 100*100, 5 frames, delay: 1 second, disposal method: none
 static const char* gGif_100_None = TEST_RESOURCE_DIR "/canvas-none.gif";
-// test gif image, resolution: 100*100, 5 frames, delay: 1 second, disposal method: none for first frame and previous for the rest
-static const char* gGif_100_Prev = TEST_RESOURCE_DIR "/canvas-prev.gif";
-// test gif image, resolution: 100*100, 5 frames, delay: 1 second, disposal method: background
-static const char* gGif_100_Bgnd = TEST_RESOURCE_DIR "/canvas-bgnd.gif";
 
 // this image if not exist, for negative test
 static const char* gGifNonExist = "non-exist.gif";
 
-void VerifyLoad( std::vector<Dali::PixelData>& pixelDataList, Dali::Vector<uint32_t>& frameDelayList,
-                 uint32_t frameCount, uint32_t width, uint32_t height, uint32_t delay )
-{
-  DALI_TEST_EQUALS( pixelDataList.size(), frameCount, TEST_LOCATION );
-  DALI_TEST_EQUALS( frameDelayList.Size(), frameCount, TEST_LOCATION );
+} // namespace
 
-  for( uint32_t idx = 0; idx<frameCount; idx++ )
-  {
-    // Check the image size and delay of each frame
-    DALI_TEST_EQUALS( pixelDataList[idx].GetWidth(), width, TEST_LOCATION );
-    DALI_TEST_EQUALS( pixelDataList[idx].GetHeight(), height, TEST_LOCATION );
-    DALI_TEST_EQUALS( frameDelayList[idx], delay, TEST_LOCATION );
-  }
-}
-}
-
-void utc_dali_gif_loader_startup(void)
+void utc_dali_animated_image_loader_startup(void)
 {
   test_return_value = TET_UNDEF;
 }
 
-void utc_dali_gif_loader_cleanup(void)
+void utc_dali_animated_image_loader_cleanup(void)
 {
   test_return_value = TET_PASS;
 }
 
-int UtcDaliGifLoadingP(void)
-{
-  std::vector<Dali::PixelData> pixelDataList;
-  Dali::Vector<uint32_t> frameDelayList;
-
-  std::unique_ptr<Dali::GifLoading> gifLoading = GifLoading::New( gGif_100_None );
-  bool succeed = gifLoading->LoadAllFrames( pixelDataList, frameDelayList );
-
-  // Check that the loading succeed
-  DALI_TEST_CHECK( succeed );
-  VerifyLoad( pixelDataList, frameDelayList, 5u, 100u, 100u, 1000u );
-
-  pixelDataList.clear();
-  gifLoading = GifLoading::New( gGif_100_Prev );
-  succeed = gifLoading->LoadAllFrames( pixelDataList, frameDelayList );
-  // Check that the loading succeed
-  DALI_TEST_CHECK( succeed );
-  VerifyLoad( pixelDataList, frameDelayList, 5u, 100u, 100u, 1000u );
-
-  pixelDataList.clear();
-  gifLoading = GifLoading::New( gGif_100_Bgnd );
-  succeed = gifLoading->LoadAllFrames( pixelDataList, frameDelayList );
-
-  // Check that the loading succeed
-  DALI_TEST_CHECK( succeed );
-  VerifyLoad( pixelDataList, frameDelayList, 5u, 100u, 100u, 1000u  );
-
-  END_TEST;
-}
-
-int UtcDaliGifLoadingN(void)
-{
-  std::vector<Dali::PixelData> pixelDataList;
-  Dali::Vector<uint32_t> frameDelayList;
-
-  std::unique_ptr<Dali::GifLoading> gifLoading = GifLoading::New( gGifNonExist );
-  bool succeed = gifLoading->LoadAllFrames( pixelDataList, frameDelayList );
-
-  // Check that the loading failed
-  DALI_TEST_CHECK( !succeed );
-
-  // Check that both pixelDataList and frameDelayList are empty
-  DALI_TEST_EQUALS( pixelDataList.size(), 0u, TEST_LOCATION );
-  DALI_TEST_EQUALS( frameDelayList.Size(), 0u, TEST_LOCATION );
-
-  END_TEST;
-}
-
-int UtcDaliGifLoadingGetImageSizeP(void)
+int UtcDaliAnimatedImageLoadingGetImageSizeP(void)
 {
-  std::unique_ptr<Dali::GifLoading> gifLoading = GifLoading::New( gGif_100_None );
-  ImageDimensions imageSize = gifLoading->GetImageSize();
+  Dali::AnimatedImageLoading animatedImageLoading = Dali::AnimatedImageLoading::New(gGif_100_None, true);
+  ImageDimensions            imageSize            = animatedImageLoading.GetImageSize();
 
   // Check that the image size is [100, 100]
-  DALI_TEST_EQUALS( imageSize.GetWidth(), 100u, TEST_LOCATION );
-  DALI_TEST_EQUALS( imageSize.GetHeight(), 100u, TEST_LOCATION );
+  DALI_TEST_EQUALS(imageSize.GetWidth(), 100u, TEST_LOCATION);
+  DALI_TEST_EQUALS(imageSize.GetHeight(), 100u, TEST_LOCATION);
 
   END_TEST;
 }
 
-int UtcDaliGifLoadingGetImageSizeN(void)
+int UtcDaliAnimatedImageLoadingGetImageSizeN(void)
 {
-  std::unique_ptr<Dali::GifLoading> gifLoading = GifLoading::New( gGifNonExist );
-  ImageDimensions imageSize = gifLoading->GetImageSize();
+  Dali::AnimatedImageLoading animatedImageLoading = Dali::AnimatedImageLoading::New(gGifNonExist, true);
+  ImageDimensions            imageSize            = animatedImageLoading.GetImageSize();
 
-  // Check that it returns zero size when the gif is not valid
-  DALI_TEST_EQUALS( imageSize.GetWidth(), 0u, TEST_LOCATION );
-  DALI_TEST_EQUALS( imageSize.GetHeight(), 0u, TEST_LOCATION );
+  // Check that it returns zero size when the animated image is not valid
+  DALI_TEST_EQUALS(imageSize.GetWidth(), 0u, TEST_LOCATION);
+  DALI_TEST_EQUALS(imageSize.GetHeight(), 0u, TEST_LOCATION);
 
   END_TEST;
 }