Merge "Fix to do not update state of render task in case of uploadOnly" into devel...

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

diff --git a/automated-tests/src/dali/utc-Dali-Rect.cpp b/automated-tests/src/dali/utc-Dali-Rect.cpp
index 6675e9d..349989c 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Rect.cpp
+++ b/automated-tests/src/dali/utc-Dali-Rect.cpp
@@ -15,11 +15,11 @@
  *
  */
 
-#include <iostream>
-
-#include <stdlib.h>
-#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
+#include <dali/public-api/dali-core.h>
+#include <stdlib.h>
+
+#include <iostream>
 
 using namespace Dali;
 
@@ -33,7 +33,6 @@ void utc_dali_rect_cleanup(void)
   test_return_value = TET_PASS;
 }
 
-
 // Positive test case for a method
 int UtcDaliRectCons01(void)
 {
@@ -95,7 +94,7 @@ int UtcDaliRectMoveConstructor(void)
 
   Rect<float> rect(10.0f, 20.0f, 400.0f, 200.0f);
 
-  Rect<float> r2 = std::move( rect );
+  Rect<float> r2 = std::move(rect);
 
   DALI_TEST_EQUALS(r2.x, 10.0f, 0.001, TEST_LOCATION);
   DALI_TEST_EQUALS(r2.y, 20.0f, 0.001, TEST_LOCATION);
@@ -111,7 +110,7 @@ int UtcDaliRectMoveAssignmentOperator(void)
   Rect<float> rect(10.0f, 20.0f, 400.0f, 200.0f);
 
   Rect<float> r2;
-  r2 = std::move( rect );
+  r2 = std::move(rect);
 
   DALI_TEST_EQUALS(r2.x, 10.0f, 0.001, TEST_LOCATION);
   DALI_TEST_EQUALS(r2.y, 20.0f, 0.001, TEST_LOCATION);
@@ -171,12 +170,12 @@ int UtcDaliRectIsEmpty(void)
 {
   TestApplication application;
 
-  Rect<int>   ri;
-  Rect<float> rf(10.0f, 20.0f, 400.0f, 200.0f);
-  Rect<float> rf2;
-  Rect<float> rf3(10.0f, 20.0f, 0.0f, 200.0f);
-  Rect<float> rf4(10.0f, 20.0f, 400.0f, 0.0f);
-  Rect<double> rd(10.0, 20.0, 0.0, 200.0);
+  Rect<int>          ri;
+  Rect<float>        rf(10.0f, 20.0f, 400.0f, 200.0f);
+  Rect<float>        rf2;
+  Rect<float>        rf3(10.0f, 20.0f, 0.0f, 200.0f);
+  Rect<float>        rf4(10.0f, 20.0f, 400.0f, 0.0f);
+  Rect<double>       rd(10.0, 20.0, 0.0, 200.0);
   Rect<unsigned int> ru(0u, 0u, 4u, 0u);
 
   DALI_TEST_CHECK(!rf.IsEmpty());
@@ -229,7 +228,6 @@ int UtcDaliRectBottom(void)
   END_TEST;
 }
 
-
 int UtcDaliRectArea(void)
 {
   TestApplication application;
@@ -240,16 +238,15 @@ int UtcDaliRectArea(void)
   END_TEST;
 }
 
-
 int UtcDaliRectIntersects(void)
 {
   TestApplication application;
 
-  Rect<float> rf1( 10.0f,  20.0f, 200.0f, 200.0f);
-  Rect<float> rf2( 10.0f, 120.0f, 200.0f, 200.0f);
-  Rect<float> rf3( 10.0f, -80.0f, 200.0f, 200.0f);
-  Rect<float> rf4(110.0f,  20.0f, 200.0f, 200.0f);
-  Rect<float> rf5(-90.0f,  20.0f, 200.0f, 200.0f);
+  Rect<float> rf1(10.0f, 20.0f, 200.0f, 200.0f);
+  Rect<float> rf2(10.0f, 120.0f, 200.0f, 200.0f);
+  Rect<float> rf3(10.0f, -80.0f, 200.0f, 200.0f);
+  Rect<float> rf4(110.0f, 20.0f, 200.0f, 200.0f);
+  Rect<float> rf5(-90.0f, 20.0f, 200.0f, 200.0f);
   Rect<float> rf6(1000.0f, 1200.0f, 10.0f, 10.0f);
 
   DALI_TEST_CHECK(rf1.Intersects(rf2));
@@ -260,26 +257,24 @@ int UtcDaliRectIntersects(void)
   END_TEST;
 }
 
-
-
 int UtcDaliRectContains(void)
 {
   TestApplication application;
 
-  Rect<float> rf1( 10.0f,  20.0f, 200.0f, 200.0f);
+  Rect<float> rf1(10.0f, 20.0f, 200.0f, 200.0f);
 
-  Rect<float> rf2( 10.0f, 120.0f, 200.0f, 200.0f);
-  Rect<float> rf3( 10.0f, -80.0f, 200.0f, 200.0f);
-  Rect<float> rf4(110.0f,  20.0f, 200.0f, 200.0f);
-  Rect<float> rf5(-90.0f,  20.0f, 200.0f, 200.0f);
+  Rect<float> rf2(10.0f, 120.0f, 200.0f, 200.0f);
+  Rect<float> rf3(10.0f, -80.0f, 200.0f, 200.0f);
+  Rect<float> rf4(110.0f, 20.0f, 200.0f, 200.0f);
+  Rect<float> rf5(-90.0f, 20.0f, 200.0f, 200.0f);
   Rect<float> rf6(1000.0f, 1200.0f, 10.0f, 10.0f);
 
-  Rect<float> rf7( 50.0f,  70.0f, 50.0f,   50.0f);
+  Rect<float> rf7(50.0f, 70.0f, 50.0f, 50.0f);
 
-  Rect<float> rf8(  10.0f,  20.0f, 100.0f, 100.0f);
-  Rect<float> rf9( 110.0f,  20.0f, 100.0f, 100.0f);
-  Rect<float> rf10( 110.0f, 120.0f, 100.0f, 100.0f);
-  Rect<float> rf11(  10.0f, 120.0f, 100.0f, 100.0f);
+  Rect<float> rf8(10.0f, 20.0f, 100.0f, 100.0f);
+  Rect<float> rf9(110.0f, 20.0f, 100.0f, 100.0f);
+  Rect<float> rf10(110.0f, 120.0f, 100.0f, 100.0f);
+  Rect<float> rf11(10.0f, 120.0f, 100.0f, 100.0f);
 
   DALI_TEST_CHECK(rf1.Contains(rf1));
   DALI_TEST_CHECK(!rf1.Contains(rf2));
@@ -297,22 +292,21 @@ int UtcDaliRectContains(void)
   END_TEST;
 }
 
-
 int UtcDaliRectOperatorNotEquals(void)
 {
   TestApplication application;
 
-  Rect<float> rf1( 10.0f,  20.0f, 200.0f, 200.0f);
-  Rect<float> rf2( 10.0f, 120.0f, 200.0f, 200.0f);
-  Rect<float> rf3( 10.0f, -80.0f, 200.0f, 200.0f);
-  Rect<float> rf4(110.0f,  20.0f, 200.0f, 200.0f);
-  Rect<float> rf5(-90.0f,  20.0f, 200.0f, 200.0f);
+  Rect<float> rf1(10.0f, 20.0f, 200.0f, 200.0f);
+  Rect<float> rf2(10.0f, 120.0f, 200.0f, 200.0f);
+  Rect<float> rf3(10.0f, -80.0f, 200.0f, 200.0f);
+  Rect<float> rf4(110.0f, 20.0f, 200.0f, 200.0f);
+  Rect<float> rf5(-90.0f, 20.0f, 200.0f, 200.0f);
   Rect<float> rf6(1000.0f, 1200.0f, 10.0f, 10.0f);
-  Rect<float> rf7( 50.0f,  70.0f, 50.0f,   50.0f);
-  Rect<float> rf8(  10.0f,  20.0f, 100.0f, 100.0f);
-  Rect<float> rf9( 110.0f,  20.0f, 100.0f, 100.0f);
-  Rect<float> rf10( 110.0f, 120.0f, 100.0f, 100.0f);
-  Rect<float> rf11(  10.0f, 120.0f, 100.0f, 100.0f);
+  Rect<float> rf7(50.0f, 70.0f, 50.0f, 50.0f);
+  Rect<float> rf8(10.0f, 20.0f, 100.0f, 100.0f);
+  Rect<float> rf9(110.0f, 20.0f, 100.0f, 100.0f);
+  Rect<float> rf10(110.0f, 120.0f, 100.0f, 100.0f);
+  Rect<float> rf11(10.0f, 120.0f, 100.0f, 100.0f);
 
   DALI_TEST_CHECK(rf1 != rf2);
   DALI_TEST_CHECK(rf1 != rf3);
@@ -327,20 +321,19 @@ int UtcDaliRectOperatorNotEquals(void)
   END_TEST;
 }
 
-
 int UtcDaliRectOperatorEquals(void)
 {
   TestApplication application;
 
-  Rect<float> rf1( 10.0f,  20.0f, 200.0f, 200.0f);
-  Rect<float> rf1p( 10.0f,  20.0f, 200.0f, 200.0f);
+  Rect<float> rf1(10.0f, 20.0f, 200.0f, 200.0f);
+  Rect<float> rf1p(10.0f, 20.0f, 200.0f, 200.0f);
 
-  Rect<float> rf2(110.0f,  20.0f, 200.0f, 200.0f);
-  Rect<float> rf3( 10.0f, 120.0f, 200.0f, 200.0f);
-  Rect<float> rf4( 10.0f,  20.0f, 300.0f, 200.0f);
-  Rect<float> rf5( 10.0f,  20.0f, 200.0f, 500.0f);
+  Rect<float> rf2(110.0f, 20.0f, 200.0f, 200.0f);
+  Rect<float> rf3(10.0f, 120.0f, 200.0f, 200.0f);
+  Rect<float> rf4(10.0f, 20.0f, 300.0f, 200.0f);
+  Rect<float> rf5(10.0f, 20.0f, 200.0f, 500.0f);
 
-  Rect<float> rf6( 0.0f,  0.0f, 9.0f, 10.0f);
+  Rect<float> rf6(0.0f, 0.0f, 9.0f, 10.0f);
 
   DALI_TEST_CHECK(rf1 == rf1p);
   DALI_TEST_CHECK(rf1 == rf1);
@@ -350,10 +343,9 @@ int UtcDaliRectOperatorEquals(void)
   DALI_TEST_CHECK(!(rf1 == rf5));
   DALI_TEST_CHECK(!(rf1 == rf6));
 
-
   // integers
-  Rect<int> ri1( 10,  20, 200, 200 );
-  Rect<int> ri1p( 10,  20, 200, 200 );
+  Rect<int> ri1(10, 20, 200, 200);
+  Rect<int> ri1p(10, 20, 200, 200);
 
   DALI_TEST_CHECK(ri1 == ri1p);
   END_TEST;
@@ -361,15 +353,15 @@ int UtcDaliRectOperatorEquals(void)
 
 int UtcDaliRectOStreamOperatorP(void)
 {
-  TestApplication application;
+  TestApplication    application;
   std::ostringstream oss;
 
-  Rect<int> rect( 1, 2, 10, 10 );
+  Rect<int> rect(1, 2, 10, 10);
 
   oss << rect;
 
   std::string expectedOutput = "[1, 2, 10, 10]";
 
-  DALI_TEST_EQUALS( oss.str(), expectedOutput, TEST_LOCATION);
+  DALI_TEST_EQUALS(oss.str(), expectedOutput, TEST_LOCATION);
   END_TEST;
 }