Remove deprecated APIs in Tizen 3.0

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

diff --git a/automated-tests/src/dali/utc-Dali-Radian.cpp b/automated-tests/src/dali/utc-Dali-Radian.cpp
index c463a4c..cfb3528 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Radian.cpp
+++ b/automated-tests/src/dali/utc-Dali-Radian.cpp
@@ -21,8 +21,6 @@ void utc_dali_radian_cleanup(void)
 // Positive test case for constructors
 int UtcDaliRadianConstructors01(void)
 {
-  TestApplication application;
-
   // Default constructor, does not initialise the value
   Radian radian0( 0.0f );
 
@@ -48,8 +46,6 @@ int UtcDaliRadianConstructors01(void)
 // Positive test case for comparison
 int UtcDaliRadianComparison01(void)
 {
-  TestApplication application;
-
   // Comparison between radians
   Radian radian0( Math::PI_2 );
   Radian radian1( Math::PI_2 );
@@ -63,8 +59,8 @@ int UtcDaliRadianComparison01(void)
   Radian radian4( Math::PI_2 );
   Degree degree0( 180.0f );
 
-  DALI_TEST_CHECK( radian3 == degree0 );
-  DALI_TEST_CHECK( radian4 != degree0 );
+  DALI_TEST_CHECK( radian3 == Radian(degree0) );
+  DALI_TEST_CHECK( radian4 != Radian(degree0) );
 
   // Comparison with float
   Radian radian5( Math::PI_2 );
@@ -79,20 +75,18 @@ int UtcDaliRadianComparison01(void)
 // test case for cast operators
 int UtcDaliRadianCastOperators01(void)
 {
-  TestApplication application;  // Exceptions require TestApplication
-
   Radian radian0( Math::PI );
 
-  const float& value0( radian0 );
+  const float& value0( radian0.radian );
   DALI_TEST_EQUALS( value0, Math::PI, 0.001f, TEST_LOCATION );
 
   radian0 = Math::PI_2;
   DALI_TEST_EQUALS( value0, Math::PI_2, 0.001f, TEST_LOCATION );
 
-  float& value1( radian0 );
+  float value1( radian0 );
   DALI_TEST_EQUALS( value1, Math::PI_2, 0.001f, TEST_LOCATION );
 
-  value1 = Math::PI;
+  radian0 = Math::PI;
   DALI_TEST_EQUALS( float(radian0), Math::PI, 0.001f, TEST_LOCATION );
   END_TEST;
 }
@@ -100,36 +94,32 @@ int UtcDaliRadianCastOperators01(void)
 
 int UtcDaliRadianCastOperatorEquals(void)
 {
-  TestApplication application;
-
   Radian a(Math::PI_2);
   Radian b(Math::PI_2);
   Radian c(Math::PI);
 
-  DALI_TEST_EQUALS(a == a, true, TEST_LOCATION);
-  DALI_TEST_EQUALS(a == b, true, TEST_LOCATION);
-  DALI_TEST_EQUALS(a == c, false, TEST_LOCATION);
+  DALI_TEST_EQUALS( a == a, true, TEST_LOCATION );
+  DALI_TEST_EQUALS( a == b, true, TEST_LOCATION );
+  DALI_TEST_EQUALS( a == c, false, TEST_LOCATION );
+  DALI_TEST_EQUALS( Degree(c) == c, true, TEST_LOCATION );
   END_TEST;
 }
 
 int UtcDaliRadianCastOperatorNotEquals(void)
 {
-  TestApplication application;
-
   Radian a(Math::PI_2);
   Radian b(Math::PI_2);
   Radian c(Math::PI);
 
-  DALI_TEST_EQUALS(a != a, false, TEST_LOCATION);
-  DALI_TEST_EQUALS(a != b, false, TEST_LOCATION);
-  DALI_TEST_EQUALS(a != c, true, TEST_LOCATION);
+  DALI_TEST_EQUALS( a != a, false, TEST_LOCATION );
+  DALI_TEST_EQUALS( a != b, false, TEST_LOCATION );
+  DALI_TEST_EQUALS( a != c, true, TEST_LOCATION );
+  DALI_TEST_EQUALS( Degree(a) != c, true, TEST_LOCATION );
   END_TEST;
 }
 
 int UtcDaliRadianCastOperatorLessThan(void)
 {
-  TestApplication application;
-
   Radian a(Math::PI_4);
   Radian b(Math::PI_2);
   Radian c(Math::PI);
@@ -148,8 +138,13 @@ int UtcDaliRadianCastOperatorLessThan(void)
   DALI_TEST_EQUALS(d < b, false, TEST_LOCATION);
   DALI_TEST_EQUALS(e < b, true, TEST_LOCATION);
 
-  DALI_TEST_EQUALS(Radian(Math::PI_2) < Degree(180.0f), true,  TEST_LOCATION);
-  DALI_TEST_EQUALS(Radian(Math::PI_2) < Degree(90.0f),  false, TEST_LOCATION);
-  DALI_TEST_EQUALS(Radian(Math::PI_2) < Degree(45.0f),  false, TEST_LOCATION);
+  DALI_TEST_EQUALS( Radian(Math::PI_2) < Degree(180.0f), true,  TEST_LOCATION);
+  DALI_TEST_EQUALS( Radian(Math::PI_2) < Degree(90.0f),  false, TEST_LOCATION);
+  DALI_TEST_EQUALS( Radian(Math::PI_2) > Degree(45.0f),  true,  TEST_LOCATION);
+
+  DALI_TEST_EQUALS( Degree(180.0f) > Radian(Math::PI_2), true,  TEST_LOCATION);
+  DALI_TEST_EQUALS( Degree(90.0f)  > Radian(Math::PI_2), false, TEST_LOCATION);
+  DALI_TEST_EQUALS( Degree(45.0f)  < Radian(Math::PI_2), true,  TEST_LOCATION);
+
   END_TEST;
 }