X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-ImageAtlas.cpp;h=a8fa8cce8c0952fd90ff4b0bd78215b58782a496;hp=38835530e0364152cf963949ae7ba952b2136abe;hb=35cd4720d71f06f810258109e38d0c185c5d41ea;hpb=f3c7e52f300fc2f6d07bcbd75ad3b992e19083f5

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ImageAtlas.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ImageAtlas.cpp
index 3883553..a8fa8cc 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-ImageAtlas.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ImageAtlas.cpp
@@ -61,7 +61,7 @@ bool IsOverlap( Rect<int> rect1, Rect<int> rect2 )
      && rect2.y < rect1.y+rect1.height;
 }
 
-}
+} // anonymous namespace
 
 void dali_image_atlas_startup(void)
 {
@@ -153,8 +153,8 @@ int UtcDaliImageAtlasSetBrokenImage(void)
   atlas.Upload( textureRect, gImageNonExist );
 
   Rect<int> pixelArea = TextureCoordinateToPixelArea(textureRect, size);
-  DALI_TEST_EQUALS( pixelArea.width, 34.f, TEST_LOCATION );
-  DALI_TEST_EQUALS( pixelArea.height, 34.f, TEST_LOCATION );
+  DALI_TEST_EQUALS( pixelArea.width, 34, TEST_LOCATION );
+  DALI_TEST_EQUALS( pixelArea.height, 34, TEST_LOCATION );
 
   END_TEST;
 }
@@ -191,23 +191,33 @@ int UtcDaliImageAtlasUploadP(void)
   Rect<int> pixelArea1 = TextureCoordinateToPixelArea(textureRect1, size);
   DALI_TEST_EQUALS( pixelArea1.width, 34, TEST_LOCATION );
   DALI_TEST_EQUALS( pixelArea1.height, 34, TEST_LOCATION );
-  std::stringstream out;
-  out<<pixelArea1.x<<", "<<pixelArea1.y<<", "<<pixelArea1.width<<", "<<pixelArea1.height;
-  DALI_TEST_CHECK(  callStack.FindMethodAndParams("TexSubImage2D", out.str()) );
+
+  TraceCallStack::NamedParams params;
+  params["width"] = ToString(pixelArea1.width);
+  params["height"] = ToString(pixelArea1.height);
+  params["xoffset"] = ToString(pixelArea1.x);
+  params["yoffset"] = ToString(pixelArea1.y);
+  DALI_TEST_CHECK( callStack.FindMethodAndParams("TexSubImage2D", params ));
 
   Rect<int> pixelArea2 = TextureCoordinateToPixelArea(textureRect2, size);
   DALI_TEST_EQUALS( pixelArea2.width, 50, TEST_LOCATION );
   DALI_TEST_EQUALS( pixelArea2.height, 50, TEST_LOCATION );
-  out.str("");
-  out<<pixelArea2.x<<", "<<pixelArea2.y<<", "<<pixelArea2.width<<", "<<pixelArea2.height;
-  DALI_TEST_CHECK(  callStack.FindMethodAndParams("TexSubImage2D", out.str()) );
+
+  params["width"] = ToString(pixelArea2.width);
+  params["height"] = ToString(pixelArea2.height);
+  params["xoffset"] = ToString(pixelArea2.x);
+  params["yoffset"] = ToString(pixelArea2.y);
+  DALI_TEST_CHECK( callStack.FindMethodAndParams("TexSubImage2D", params ) );
 
   Rect<int> pixelArea3 = TextureCoordinateToPixelArea(textureRect3, size);
   DALI_TEST_EQUALS( pixelArea3.width, 128, TEST_LOCATION );
   DALI_TEST_EQUALS( pixelArea3.height, 128, TEST_LOCATION );
-  out.str("");
-  out<<pixelArea3.x<<", "<<pixelArea3.y<<", "<<pixelArea3.width<<", "<<pixelArea3.height;
-  DALI_TEST_CHECK( callStack.FindMethodAndParams("TexSubImage2D", out.str()) );
+
+  params["width"] = ToString(pixelArea3.width);
+  params["height"] = ToString(pixelArea3.height);
+  params["xoffset"] = ToString(pixelArea3.x);
+  params["yoffset"] = ToString(pixelArea3.y);
+  DALI_TEST_CHECK( callStack.FindMethodAndParams("TexSubImage2D", params ) );
 
   DALI_TEST_CHECK( ! IsOverlap(pixelArea1, pixelArea2) );
   DALI_TEST_CHECK( ! IsOverlap(pixelArea1, pixelArea3) );
@@ -231,8 +241,8 @@ int UtcDaliImageAtlasRemove(void)
 
   // one pixel gap
   Rect<int> pixelArea = TextureCoordinateToPixelArea(textureRect2, size);
-  DALI_TEST_EQUALS( pixelArea.x, 0.f, TEST_LOCATION );
-  DALI_TEST_EQUALS( pixelArea.y, 0.f, TEST_LOCATION );
+  DALI_TEST_EQUALS( pixelArea.x, 0, TEST_LOCATION );
+  DALI_TEST_EQUALS( pixelArea.y, 0, TEST_LOCATION );
 
   END_TEST;
 }
@@ -267,8 +277,20 @@ int UtcDaliImageAtlasImageView(void)
 
   callStack.Enable(false);
 
-  DALI_TEST_CHECK(  callStack.FindMethodAndParams("TexSubImage2D", "0, 0, 34, 34" ) );
-  DALI_TEST_CHECK(  callStack.FindMethodAndParams("TexSubImage2D", "0, 34, 50, 50" ) );
+  TraceCallStack::NamedParams params1;
+  params1["width"] = "34";
+  params1["height"] = "34";
+  params1["xoffset"] = "0";
+  params1["yoffset"] = "0";
+
+  TraceCallStack::NamedParams params2;
+  params2["width"] = "50";
+  params2["height"] = "50";
+  params2["xoffset"] = "0";
+  params2["yoffset"] = "34";
+
+  DALI_TEST_EQUALS(  callStack.FindMethodAndParams("TexSubImage2D", params1 ), true, TEST_LOCATION );
+  DALI_TEST_EQUALS(  callStack.FindMethodAndParams("TexSubImage2D", params2 ), true, TEST_LOCATION );
 
   callStack.Reset();
   callStack.Enable(true);
@@ -288,7 +310,14 @@ int UtcDaliImageAtlasImageView(void)
   application.Render(RENDER_FRAME_INTERVAL);
 
   callStack.Enable(false);
-  DALI_TEST_CHECK(  callStack.FindMethodAndParams("TexSubImage2D", "0, 34, 100, 100" ) );
+
+  TraceCallStack::NamedParams params3;
+  params3["width"] = "100";
+  params3["height"] = "100";
+  params3["xoffset"] = "0";
+  params3["yoffset"] = "34";
+
+  DALI_TEST_EQUALS(  callStack.FindMethodAndParams("TexSubImage2D", params3 ), true, TEST_LOCATION );
 
   END_TEST;
 }