X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali%2Futc-Dali-Texture.cpp;h=0222064b0cbeb4781d2f652ddfc2362d702bb897;hb=5d24b043d552408c39f42c1abd635302f3bbaba1;hp=458191e439d164d969a87905cab6af7109ff87b4;hpb=68376524a0f3362fa7f0a52ffb005f611fdf3175;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/automated-tests/src/dali/utc-Dali-Texture.cpp b/automated-tests/src/dali/utc-Dali-Texture.cpp
index 458191e..0222064 100644
--- a/automated-tests/src/dali/utc-Dali-Texture.cpp
+++ b/automated-tests/src/dali/utc-Dali-Texture.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 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.
@@ -17,7 +17,6 @@
 
 #include <dali/public-api/dali-core.h>
 #include <dali/devel-api/images/pixel-data-devel.h>
-#include <dali/devel-api/images/pixel-devel.h>
 #include <dali-test-suite-utils.h>
 #include <test-native-image.h>
 
@@ -510,6 +509,8 @@ int UtcDaliTextureUpload05(void)
       out << GL_TEXTURE_2D <<", "<< 0u << ", " << width/2 << ", " <<  height/2 << ", " << width/2 << ", " <<  height/2;
       DALI_TEST_CHECK( callStack.FindMethodAndParams("CompressedTexSubImage2D", out.str().c_str() ) );
     }
+
+    application.GetGlAbstraction().ResetTextureCallStack();
   }
 
   END_TEST;
@@ -562,12 +563,12 @@ int UtcDaliTextureUpload06(void)
 
 int UtcDaliTextureUpload07(void)
 {
-  DevelPixel::Format FLOATING_POINT_PIXEL_FORMATS[] =
+  Pixel::Format FLOATING_POINT_PIXEL_FORMATS[] =
   {
-    DevelPixel::RGB16F,
-    DevelPixel::RGB32F,
+    Pixel::RGB16F,
+    Pixel::RGB32F,
   };
-  const unsigned int NUMBER_OF_FLOATING_POINT_PIXEL_FORMATS = sizeof( FLOATING_POINT_PIXEL_FORMATS ) / sizeof( DevelPixel::Format );
+  const unsigned int NUMBER_OF_FLOATING_POINT_PIXEL_FORMATS = sizeof( FLOATING_POINT_PIXEL_FORMATS ) / sizeof( Pixel::Format );
 
   for( unsigned int index = 0; index < NUMBER_OF_FLOATING_POINT_PIXEL_FORMATS; ++index )
   {
@@ -577,7 +578,7 @@ int UtcDaliTextureUpload07(void)
     unsigned int width(64);
     unsigned int height(64);
     tet_infoline( "Creating a floating point texture" );
-    Texture texture = Texture::New( TextureType::TEXTURE_2D, static_cast<Pixel::Format>( FLOATING_POINT_PIXEL_FORMATS[index] ), width, height );
+    Texture texture = Texture::New( TextureType::TEXTURE_2D, FLOATING_POINT_PIXEL_FORMATS[index], width, height );
 
     application.GetGlAbstraction().EnableTextureCallTrace(true);
 
@@ -599,7 +600,7 @@ int UtcDaliTextureUpload07(void)
     tet_infoline( "Creating a RGB pixel buffer and adding that to the texture to ensure it is handled correctly" );
     unsigned int bufferSize( width * height * 3 );
     unsigned char* buffer= reinterpret_cast<unsigned char*>( malloc( bufferSize ) );
-    PixelData pixelData = DevelPixelData::New( buffer, bufferSize, width, height, FLOATING_POINT_PIXEL_FORMATS[index], PixelData::FREE );
+    PixelData pixelData = PixelData::New( buffer, bufferSize, width, height, FLOATING_POINT_PIXEL_FORMATS[index], PixelData::FREE );
     texture.Upload( pixelData );
     application.SendNotification();
     application.Render();
@@ -719,7 +720,7 @@ int UtcDaliTextureGetHeight(void)
 int UtcDaliTextureContextLoss(void)
 {
   tet_infoline("UtcDaliTextureContextLoss\n");
-  TestApplication application; // Default config: DALI_DISCARDS_ALL_DATA
+  TestApplication application;
 
   //Create the texture
   unsigned int width(64);