Merge branch 'devel/master' into tizen

[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 2a9bf4c..be57951 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Vector2.cpp
+++ b/automated-tests/src/dali/utc-Dali-Vector2.cpp
@@ -390,7 +390,7 @@ int UtcDaliVector2OperatorSubscriptN(void)
   try
   {
     float& w = testVector[4];
-    if(w==0.0f);
+    (void)w; // Suppress unused variable warning
     tet_result(TET_FAIL);
   }
   catch (Dali::DaliException& e)
@@ -421,7 +421,7 @@ int UtcDaliVector2OperatorConstSubscriptN(void)
   try
   {
     const float& w = testVector2[4];
-    if(w==0.0f);
+    (void)w; // Suppress unused variable warning
     tet_result(TET_FAIL);
   }
   catch (Dali::DaliException& e)
@@ -607,77 +607,3 @@ int UtcDaliVector2ClampP(void)
   END_TEST;
 }
 
-int UtcDaliVector2FitInsideP(void)
-{
-  TestApplication application;
-  DALI_TEST_EQUALS( Vector2(  1.0f,  2.0f ), FitInside( Vector2(   1.0f,  2.0f ), Vector2( 10.0f, 20.0f ) ), TEST_LOCATION );
-  DALI_TEST_EQUALS( Vector2(  1.0f,  0.5f ), FitInside( Vector2(   1.0f,  2.0f ), Vector2( 20.0f, 10.0f ) ), TEST_LOCATION );
-  DALI_TEST_EQUALS( Vector2( 10.0f, 20.0f ), FitInside( Vector2(  10.0f, 20.0f ), Vector2(  1.0f,  2.0f ) ), TEST_LOCATION );
-  DALI_TEST_EQUALS( Vector2( 10.0f, 10.0f ), FitInside( Vector2( 100.0f, 10.0f ), Vector2( 10.0f, 10.0f ) ), TEST_LOCATION );
-  DALI_TEST_EQUALS( Vector2( 20.0f, 10.0f ), FitInside( Vector2(  20.0f, 20.0f ), Vector2( 10.0f,  5.0f ) ), TEST_LOCATION );
-  DALI_TEST_EQUALS( Vector2( 10.0f, 20.0f ), FitInside( Vector2(  20.0f, 20.0f ), Vector2(  5.0f, 10.0f ) ), TEST_LOCATION );
-  END_TEST;
-}
-
-int UtcDaliVector2FitInside01N(void)
-{
-  TestApplication application;
-  Size size = FitInside( Vector2(   1.0f,  2.0f ), Vector2( 0.0f, 0.0f ) );
-  DALI_TEST_EQUALS( false, std::isfinite(size.y), TEST_LOCATION );
-  END_TEST;
-}
-
-int UtcDaliVector2FitScaleToFillP(void)
-{
-  TestApplication application;
-  DALI_TEST_EQUALS( Vector2(  1.0f,  2.0f ), FitScaleToFill( Vector2(   1.0f,  2.0f ), Vector2( 10.0f, 20.0f ) ), TEST_LOCATION );
-  DALI_TEST_EQUALS( Vector2(  1.0f,  2.0f ), FitScaleToFill( Vector2(  10.0f, 20.0f ), Vector2(  1.0f,  2.0f ) ), TEST_LOCATION );
-  DALI_TEST_EQUALS( Vector2( 10.0f,  1.0f ), FitScaleToFill( Vector2( 100.0f, 10.0f ), Vector2( 10.0f, 10.0f ) ), TEST_LOCATION );
-  DALI_TEST_EQUALS( Vector2(  5.0f,  5.0f ), FitScaleToFill( Vector2(  20.0f, 20.0f ), Vector2( 10.0f,  5.0f ) ), TEST_LOCATION );
-  DALI_TEST_EQUALS( Vector2(  5.0f,  5.0f ), FitScaleToFill( Vector2(  20.0f, 20.0f ), Vector2(  5.0f, 10.0f ) ), TEST_LOCATION );
-  DALI_TEST_EQUALS( Vector2( 20.0f, 40.0f ), FitScaleToFill( Vector2(  20.0f,  0.0f ), Vector2(  5.0f, 10.0f ) ), TEST_LOCATION );
-  DALI_TEST_EQUALS( Vector2( 10.0f, 20.0f ), FitScaleToFill( Vector2(   0.0f, 20.0f ), Vector2(  5.0f, 10.0f ) ), TEST_LOCATION );
-  END_TEST;
-}
-
-
-int UtcDaliVector2FitScaleToFillN(void)
-{
-  TestApplication application;
-  Vector2 target(0.f, 0.f);
-  Size size = FitScaleToFill( target, Vector2( 0.0f, 0.0f ) );
-  DALI_TEST_EQUALS( size, target, TEST_LOCATION );
-  END_TEST;
-}
-
-int UtcDaliVector2ShrinkInsideP(void)
-{
-  TestApplication application;
-  DALI_TEST_EQUALS( Vector2(  1.0f,  2.0f ), ShrinkInside( Vector2(   1.0f,  2.0f ), Vector2( 10.0f, 20.0f ) ), TEST_LOCATION );
-  DALI_TEST_EQUALS( Vector2(  1.0f,  2.0f ), ShrinkInside( Vector2(  10.0f, 20.0f ), Vector2(  1.0f,  2.0f ) ), TEST_LOCATION );
-  DALI_TEST_EQUALS( Vector2( 10.0f, 10.0f ), ShrinkInside( Vector2( 100.0f, 10.0f ), Vector2( 10.0f, 10.0f ) ), TEST_LOCATION );
-  DALI_TEST_EQUALS( Vector2( 10.0f,  5.0f ), ShrinkInside( Vector2(  20.0f, 20.0f ), Vector2( 10.0f,  5.0f ) ), TEST_LOCATION );
-  DALI_TEST_EQUALS( Vector2(  5.0f, 10.0f ), ShrinkInside( Vector2(  20.0f, 20.0f ), Vector2(  5.0f, 10.0f ) ), TEST_LOCATION );
-  DALI_TEST_EQUALS( Vector2(  5.0f, 10.0f ), ShrinkInside( Vector2(  10.0f, 10.0f ), Vector2( 10.0f, 20.0f ) ), TEST_LOCATION );
-  DALI_TEST_EQUALS( Vector2( 10.0f,  5.0f ), ShrinkInside( Vector2(  10.0f, 10.0f ), Vector2( 20.0f, 10.0f ) ), TEST_LOCATION );
-  END_TEST;
-}
-
-int UtcDaliVector2ShrinkInside01N(void)
-{
-  TestApplication application;
-  Vector2 target(0.f, 0.f);
-  Size size = ShrinkInside( Vector2( -1.0f,  1.0f ), Vector2( 0.0f, 1.0f ) );
-  DALI_TEST_EQUALS( false, std::isfinite(size.x), TEST_LOCATION );
-  END_TEST;
-}
-
-int UtcDaliVector2ShrinkInside02N(void)
-{
-  TestApplication application;
-  Vector2 target(0.f, 0.f);
-  Size size = ShrinkInside( Vector2( -1.0f,  -1.0f ), Vector2( 1.0f, 0.0f ) );
-  DALI_TEST_EQUALS( false, std::isfinite(size.y), TEST_LOCATION );
-  END_TEST;
-}
-