Adding 'override', removing 'virtual' from overriding functions' declarations in...

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

diff --git a/automated-tests/src/dali/utc-Dali-Vector2.cpp b/automated-tests/src/dali/utc-Dali-Vector2.cpp
index c01686c..64f63ea 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Vector2.cpp
+++ b/automated-tests/src/dali/utc-Dali-Vector2.cpp
@@ -83,6 +83,16 @@ int UtcDaliVector2Constructor05P(void)
   END_TEST;
 }
 
+int UtcDaliVector2ConstructorUint16PairP(void)
+{
+  TestApplication application;
+  Uint16Pair pair( 20, 30 );
+  Vector2 vec2(pair);
+  DALI_TEST_EQUALS(vec2.x, 20.0f, 0.001, TEST_LOCATION);
+  DALI_TEST_EQUALS(vec2.y, 30.0f, 0.001, TEST_LOCATION);
+  END_TEST;
+}
+
 int UtcDaliVector2CopyConstructor01P(void)
 {
   TestApplication application;
@@ -116,6 +126,51 @@ int UtcDaliVector2CopyConstructor03P(void)
   END_TEST;
 }
 
+int UtcDaliVector2CopyConstructor04P(void)
+{
+  TestApplication application;
+  Vector2 vec0( 10.f, 20.f );
+  Vector2 vec1( vec0 );
+  DALI_TEST_EQUALS(vec1.x, 10.0f, 0.001, TEST_LOCATION);
+  DALI_TEST_EQUALS(vec1.y, 20.0f, 0.001, TEST_LOCATION);
+  END_TEST;
+}
+
+int UtcDaliVector2MoveConstructor(void)
+{
+  TestApplication application;
+  Vector2 vec0( 10.f, 20.f );
+  Vector2 vec1 = std::move( vec0 );
+  DALI_TEST_EQUALS(vec1.x, 10.0f, 0.001, TEST_LOCATION);
+  DALI_TEST_EQUALS(vec1.y, 20.0f, 0.001, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliVector2CopyAssignment(void)
+{
+  TestApplication application;
+  Vector2 vec0( 10.f, 20.f );
+  Vector2 vec1;
+  vec1 = vec0;
+  DALI_TEST_EQUALS(vec1.x, 10.0f, 0.001, TEST_LOCATION);
+  DALI_TEST_EQUALS(vec1.y, 20.0f, 0.001, TEST_LOCATION);
+
+  END_TEST;
+}
+
+int UtcDaliVector2MoveAssignment(void)
+{
+  TestApplication application;
+  Vector2 vec0( 10.f, 20.f );
+  Vector2 vec1;
+  vec1 = std::move( vec0 );
+  DALI_TEST_EQUALS(vec1.x, 10.0f, 0.001, TEST_LOCATION);
+  DALI_TEST_EQUALS(vec1.y, 20.0f, 0.001, TEST_LOCATION);
+
+  END_TEST;
+}
+
 int UtcDaliVector2AssignP(void)
 {
   TestApplication application;
@@ -390,6 +445,7 @@ int UtcDaliVector2OperatorSubscriptN(void)
   try
   {
     float& w = testVector[4];
+    (void)w; // Suppress unused variable warning
     tet_result(TET_FAIL);
   }
   catch (Dali::DaliException& e)
@@ -420,6 +476,7 @@ int UtcDaliVector2OperatorConstSubscriptN(void)
   try
   {
     const float& w = testVector2[4];
+    (void)w; // Suppress unused variable warning
     tet_result(TET_FAIL);
   }
   catch (Dali::DaliException& e)