X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali%2Futc-Dali-Vector3.cpp;h=1a2ba64eef864511afe1e2722fe46d5ae7a98134;hb=21ad0307d423d39fd376eafd67fb4963c0f040cc;hp=e9542776ec760f1210b9f9fb7656daa56c441c5a;hpb=8c367b7bac116e2c5db05c0bbba4ea2ab481bb57;p=platform%2Fcore%2Fuifw%2Fdali-core.git

diff --git a/automated-tests/src/dali/utc-Dali-Vector3.cpp b/automated-tests/src/dali/utc-Dali-Vector3.cpp
index e954277..1a2ba64 100644
--- a/automated-tests/src/dali/utc-Dali-Vector3.cpp
+++ b/automated-tests/src/dali/utc-Dali-Vector3.cpp
@@ -379,7 +379,7 @@ int UtcDaliVector3ConstOperatorSubscriptP(void)
   try
   {
     float& w = testVector[4];
-    if(w==0.0f);
+    (void)w; // Suppress unused variable warning
     tet_result(TET_FAIL);
   }
   catch (Dali::DaliException& e)
@@ -391,7 +391,7 @@ int UtcDaliVector3ConstOperatorSubscriptP(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)
@@ -637,76 +637,6 @@ int UtcDaliVector3ClampP(void)
   END_TEST;
 }
 
-int UtcDaliVector3FitKeepAspectRatioP(void)
-{
-  TestApplication application;
-  Vector3 target(10.0f, 20.0f, 30.0f);
-  Vector3 source1(1.0f, 2.0f, 3.0f);
-  Vector3 source2(1.0f, 1.0f, 1.0f);
-
-  DALI_TEST_EQUALS( FitKeepAspectRatio( target, target ), Vector3(1.0f, 1.0f, 1.0f), 0.001, TEST_LOCATION );
-  DALI_TEST_EQUALS( FitKeepAspectRatio( target, source1 ), Vector3(10.0f, 10.0f, 10.0f), 0.001, TEST_LOCATION );
-  DALI_TEST_EQUALS( FitKeepAspectRatio( target, source2 ), Vector3(10.0f, 10.0f, 10.0f), 0.001, TEST_LOCATION );
-  DALI_TEST_EQUALS( FitKeepAspectRatio( source2, target ), Vector3(0.0333f, 0.0333f, 0.0333f), 0.001, TEST_LOCATION );
-  END_TEST;
-}
-
-int UtcDaliVector3FillKeepAspectRatioP(void)
-{
-  TestApplication application;
-  Vector3 target(10.0f, 20.0f, 30.0f);
-  Vector3 source1(1.0f, 2.0f, 3.0f);
-  Vector3 source2(1.0f, 1.0f, 1.0f);
-
-  DALI_TEST_EQUALS( FillKeepAspectRatio( target, target ), Vector3(1.0f, 1.0f, 1.0f), 0.001, TEST_LOCATION );
-  DALI_TEST_EQUALS( FillKeepAspectRatio( target, source1 ), Vector3(10.0f, 10.0f, 10.0f), 0.001, TEST_LOCATION );
-  DALI_TEST_EQUALS( FillKeepAspectRatio( target, source2 ), Vector3(30.0f, 30.0f, 30.0f), 0.001, TEST_LOCATION );
-  DALI_TEST_EQUALS( FillKeepAspectRatio( source2, target ), Vector3(0.1f, 0.1f, 0.1f), 0.001, TEST_LOCATION );
-
-  END_TEST;
-}
-
-int UtcDaliVector3FillXYKeepAspectRatioP(void)
-{
-  TestApplication application;
-  Vector3 target(10.0f, 20.0f, 30.0f);
-  Vector3 source1(1.0f, 2.0f, 3.0f);
-  Vector3 source2(1.0f, 1.0f, 1.0f);
-
-  DALI_TEST_EQUALS( FillXYKeepAspectRatio( target, target ), Vector3(1.0f, 1.0f, 1.0f), 0.001, TEST_LOCATION );
-  DALI_TEST_EQUALS( FillXYKeepAspectRatio( target, source1 ), Vector3(10.0f, 10.0f, 10.0f), 0.001, TEST_LOCATION );
-  DALI_TEST_EQUALS( FillXYKeepAspectRatio( target, source2 ), Vector3(20.0f, 20.0f, 20.0f), 0.001, TEST_LOCATION );
-  DALI_TEST_EQUALS( FillXYKeepAspectRatio( source2, target ), Vector3(0.1f, 0.1f, 0.1f), 0.001, TEST_LOCATION );
-
-  END_TEST;
-}
-
-int UtcDaliVector3ShrinkInsideKeepAspectRatioP(void)
-{
-  TestApplication application;
-  Vector3 target(1.0f, 2.0f, 3.0f);
-  Vector3 source1(10.0f, 20.0f, 30.0f);
-  Vector3 source2(10.0f, 10.0f, 10.0f);
-
-  DALI_TEST_EQUALS( ShrinkInsideKeepAspectRatio( target, target ), Vector3(1.0f, 1.0f, 1.0f), 0.001, TEST_LOCATION );
-  DALI_TEST_EQUALS( ShrinkInsideKeepAspectRatio( target, source1 ), Vector3(0.1f, 0.1f, 0.1f), 0.001, TEST_LOCATION );
-  DALI_TEST_EQUALS( ShrinkInsideKeepAspectRatio( target, source2 ), Vector3(0.1f, 0.1f, 0.1f), 0.001, TEST_LOCATION );
-  DALI_TEST_EQUALS( ShrinkInsideKeepAspectRatio( source2, target ), Vector3::ONE, 0.001, TEST_LOCATION );
-  END_TEST;
-}
-
-int UtcDaliVector3ShrinkInsideKeepAspectRatioN(void)
-{
-  TestApplication application;
-  Vector3 target(-1.0f, -1.0f, -1.0f);
-  Vector3 source(0.0f, 0.0f, 0.0f);
-
-  Vector3 shrink = ShrinkInsideKeepAspectRatio( target, source );
-
-  DALI_TEST_EQUALS( false, std::isfinite(shrink.y), TEST_LOCATION );
-  END_TEST;
-}
-
 int UtcDaliVector3ConstantsP(void)
 {
   TestApplication application;