X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fdali-toolkit-test-utils%2Ftest-compare-types.h;h=d917107aba831aa178199357cb03a628bf9b733f;hb=abc8459e18c5a7f8730c9493885fd067126520cb;hp=248276e555ae6609b413c2a853db690979c3203f;hpb=cb30ef68af0383b073ba2d425d3d95c1e916cbb4;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

diff --git a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-compare-types.h b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-compare-types.h
index 248276e..d917107 100644
--- a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-compare-types.h
+++ b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/test-compare-types.h
@@ -2,7 +2,7 @@
 #define DALI_TEST_COMPARE_TYPES_H
 
 /*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,8 +20,7 @@
 #include <dali/public-api/dali-core.h>
 using namespace Dali;
 
-
-template <typename Type>
+template<typename Type>
 inline bool CompareType(Type value1, Type value2, float epsilon)
 {
   return value1 == value2;
@@ -34,7 +33,7 @@ inline bool CompareType(Type value1, Type value2, float epsilon)
  * @param[in] epsilon difference threshold
  * @returns true if difference is smaller than epsilon threshold, false otherwise
  */
-template <>
+template<>
 inline bool CompareType<float>(float value1, float value2, float epsilon)
 {
   return fabsf(value1 - value2) < epsilon;
@@ -47,10 +46,10 @@ inline bool CompareType<float>(float value1, float value2, float epsilon)
  * @param[in] epsilon difference threshold
  * @returns true if difference is smaller than epsilon threshold, false otherwise
  */
-template <>
+template<>
 inline bool CompareType<Vector2>(Vector2 vector1, Vector2 vector2, float epsilon)
 {
-  return fabsf(vector1.x - vector2.x)<epsilon && fabsf(vector1.y - vector2.y)<epsilon;
+  return fabsf(vector1.x - vector2.x) < epsilon && fabsf(vector1.y - vector2.y) < epsilon;
 }
 
 /**
@@ -60,15 +59,14 @@ inline bool CompareType<Vector2>(Vector2 vector1, Vector2 vector2, float epsilon
  * @param[in] epsilon difference threshold
  * @returns true if difference is smaller than epsilon threshold, false otherwise
  */
-template <>
+template<>
 inline bool CompareType<Vector3>(Vector3 vector1, Vector3 vector2, float epsilon)
 {
-  return fabsf(vector1.x - vector2.x)<epsilon &&
-         fabsf(vector1.y - vector2.y)<epsilon &&
-         fabsf(vector1.z - vector2.z)<epsilon;
+  return fabsf(vector1.x - vector2.x) < epsilon &&
+         fabsf(vector1.y - vector2.y) < epsilon &&
+         fabsf(vector1.z - vector2.z) < epsilon;
 }
 
-
 /**
  * A helper for fuzzy-comparing Vector4 objects
  * @param[in] vector1 the first object
@@ -76,39 +74,48 @@ inline bool CompareType<Vector3>(Vector3 vector1, Vector3 vector2, float epsilon
  * @param[in] epsilon difference threshold
  * @returns true if difference is smaller than epsilon threshold, false otherwise
  */
-template <>
+template<>
 inline bool CompareType<Vector4>(Vector4 vector1, Vector4 vector2, float epsilon)
 {
-  return fabsf(vector1.x - vector2.x)<epsilon &&
-         fabsf(vector1.y - vector2.y)<epsilon &&
-         fabsf(vector1.z - vector2.z)<epsilon &&
-         fabsf(vector1.w - vector2.w)<epsilon;
+  return fabsf(vector1.x - vector2.x) < epsilon &&
+         fabsf(vector1.y - vector2.y) < epsilon &&
+         fabsf(vector1.z - vector2.z) < epsilon &&
+         fabsf(vector1.w - vector2.w) < epsilon;
 }
 
-template <>
+template<>
 inline bool CompareType<Quaternion>(Quaternion q1, Quaternion q2, float epsilon)
 {
   Quaternion q2N = -q2; // These quaternions represent the same rotation
   return CompareType<Vector4>(q1.mVector, q2.mVector, epsilon) || CompareType<Vector4>(q1.mVector, q2N.mVector, epsilon);
 }
 
-template <>
+template<>
 inline bool CompareType<Radian>(Radian q1, Radian q2, float epsilon)
 {
   return CompareType<float>(q1.radian, q2.radian, epsilon);
 }
 
-template <>
+template<>
 inline bool CompareType<Degree>(Degree q1, Degree q2, float epsilon)
 {
   return CompareType<float>(q1.degree, q2.degree, epsilon);
 }
 
-template <>
+template<>
+inline bool CompareType<Extents>(Extents extents1, Extents extents2, float epsilon)
+{
+  return (extents1.start == extents2.start) &&
+         (extents1.end == extents2.end) &&
+         (extents1.top == extents2.top) &&
+         (extents1.bottom == extents2.bottom);
+}
+
+template<>
 inline bool CompareType<Property::Value>(Property::Value q1, Property::Value q2, float epsilon)
 {
   Property::Type type = q1.GetType();
-  if( type != q2.GetType() )
+  if(type != q2.GetType())
   {
     return false;
   }
@@ -121,7 +128,7 @@ inline bool CompareType<Property::Value>(Property::Value q1, Property::Value q2,
       bool a, b;
       q1.Get(a);
       q2.Get(b);
-      result =  a == b;
+      result = a == b;
       break;
     }
     case Property::INTEGER:
@@ -129,7 +136,7 @@ inline bool CompareType<Property::Value>(Property::Value q1, Property::Value q2,
       int a, b;
       q1.Get(a);
       q2.Get(b);
-      result =  a == b;
+      result = a == b;
       break;
     }
     case Property::FLOAT:
@@ -137,7 +144,7 @@ inline bool CompareType<Property::Value>(Property::Value q1, Property::Value q2,
       float a, b;
       q1.Get(a);
       q2.Get(b);
-      result =  CompareType<float>(a, b, epsilon);
+      result = CompareType<float>(a, b, epsilon);
       break;
     }
     case Property::VECTOR2:
@@ -173,17 +180,32 @@ inline bool CompareType<Property::Value>(Property::Value q1, Property::Value q2,
       result = CompareType<Quaternion>(a, b, epsilon);
       break;
     }
+    case Property::STRING:
+    {
+      std::string a, b;
+      q1.Get(a);
+      q2.Get(b);
+      result = (a.compare(b) == 0);
+      break;
+    }
     case Property::MATRIX:
     case Property::MATRIX3:
-    case Property::STRING:
     case Property::ARRAY:
     case Property::MAP:
     {
       //TODO: Implement this?
-      DALI_ASSERT_ALWAYS( 0 && "Not implemented");
+      DALI_ASSERT_ALWAYS(0 && "Not implemented");
       result = false;
       break;
     }
+    case Property::EXTENTS:
+    {
+      Extents a, b;
+      q1.Get(a);
+      q2.Get(b);
+      result = CompareType<Extents>(a, b, epsilon);
+      break;
+    }
     case Property::NONE:
     {
       result = false;
@@ -194,6 +216,4 @@ inline bool CompareType<Property::Value>(Property::Value q1, Property::Value q2,
   return result;
 }
 
-
-
 #endif