Merge branch 'devel/master' into tizen

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

diff --git a/automated-tests/src/dali/utc-Dali-PropertyTypes.cpp b/automated-tests/src/dali/utc-Dali-PropertyTypes.cpp
index c5b6252..d2f1fe8 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-PropertyTypes.cpp
+++ b/automated-tests/src/dali/utc-Dali-PropertyTypes.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015 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.
@@ -15,115 +15,114 @@
  *
  */
 
-#include <iostream>
-#include <iomanip>
-#include <stdlib.h>
-#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
+#include <dali/public-api/dali-core.h>
+#include <stdlib.h>
 
-using namespace Dali;
+#include <iomanip>
+#include <iostream>
 
-DALI_IMPORT_API const char* const GetName(Property::Type type);
+using namespace Dali;
 
 int UtcDaliPropertyTypesGetNameP(void)
 {
-  DALI_TEST_EQUALS( "NONE",               Dali::PropertyTypes::GetName(Property::NONE               ), TEST_LOCATION );
-  DALI_TEST_EQUALS( "BOOLEAN",            Dali::PropertyTypes::GetName(Property::BOOLEAN            ), TEST_LOCATION );
-  DALI_TEST_EQUALS( "FLOAT",              Dali::PropertyTypes::GetName(Property::FLOAT              ), TEST_LOCATION );
-  DALI_TEST_EQUALS( "INTEGER",            Dali::PropertyTypes::GetName(Property::INTEGER            ), TEST_LOCATION );
-  DALI_TEST_EQUALS( "VECTOR2",            Dali::PropertyTypes::GetName(Property::VECTOR2            ), TEST_LOCATION );
-  DALI_TEST_EQUALS( "VECTOR3",            Dali::PropertyTypes::GetName(Property::VECTOR3            ), TEST_LOCATION );
-  DALI_TEST_EQUALS( "VECTOR4",            Dali::PropertyTypes::GetName(Property::VECTOR4            ), TEST_LOCATION );
-  DALI_TEST_EQUALS( "MATRIX3",            Dali::PropertyTypes::GetName(Property::MATRIX3            ), TEST_LOCATION );
-  DALI_TEST_EQUALS( "MATRIX",             Dali::PropertyTypes::GetName(Property::MATRIX             ), TEST_LOCATION );
-  DALI_TEST_EQUALS( "RECTANGLE",          Dali::PropertyTypes::GetName(Property::RECTANGLE          ), TEST_LOCATION );
-  DALI_TEST_EQUALS( "ROTATION",           Dali::PropertyTypes::GetName(Property::ROTATION           ), TEST_LOCATION );
-  DALI_TEST_EQUALS( "STRING",             Dali::PropertyTypes::GetName(Property::STRING             ), TEST_LOCATION );
-  DALI_TEST_EQUALS( "ARRAY",              Dali::PropertyTypes::GetName(Property::ARRAY              ), TEST_LOCATION );
-  DALI_TEST_EQUALS( "MAP",                Dali::PropertyTypes::GetName(Property::MAP                ), TEST_LOCATION );
+  DALI_TEST_EQUALS("NONE", Dali::PropertyTypes::GetName(Property::NONE), TEST_LOCATION);
+  DALI_TEST_EQUALS("BOOLEAN", Dali::PropertyTypes::GetName(Property::BOOLEAN), TEST_LOCATION);
+  DALI_TEST_EQUALS("FLOAT", Dali::PropertyTypes::GetName(Property::FLOAT), TEST_LOCATION);
+  DALI_TEST_EQUALS("INTEGER", Dali::PropertyTypes::GetName(Property::INTEGER), TEST_LOCATION);
+  DALI_TEST_EQUALS("VECTOR2", Dali::PropertyTypes::GetName(Property::VECTOR2), TEST_LOCATION);
+  DALI_TEST_EQUALS("VECTOR3", Dali::PropertyTypes::GetName(Property::VECTOR3), TEST_LOCATION);
+  DALI_TEST_EQUALS("VECTOR4", Dali::PropertyTypes::GetName(Property::VECTOR4), TEST_LOCATION);
+  DALI_TEST_EQUALS("MATRIX3", Dali::PropertyTypes::GetName(Property::MATRIX3), TEST_LOCATION);
+  DALI_TEST_EQUALS("MATRIX", Dali::PropertyTypes::GetName(Property::MATRIX), TEST_LOCATION);
+  DALI_TEST_EQUALS("RECTANGLE", Dali::PropertyTypes::GetName(Property::RECTANGLE), TEST_LOCATION);
+  DALI_TEST_EQUALS("ROTATION", Dali::PropertyTypes::GetName(Property::ROTATION), TEST_LOCATION);
+  DALI_TEST_EQUALS("STRING", Dali::PropertyTypes::GetName(Property::STRING), TEST_LOCATION);
+  DALI_TEST_EQUALS("ARRAY", Dali::PropertyTypes::GetName(Property::ARRAY), TEST_LOCATION);
+  DALI_TEST_EQUALS("MAP", Dali::PropertyTypes::GetName(Property::MAP), TEST_LOCATION);
   END_TEST;
 }
 
 int UtcDaliPropertyTypesGet02P(void)
 {
-  DALI_TEST_CHECK( Dali::PropertyTypes::Get<bool>() == Property::BOOLEAN );
+  DALI_TEST_CHECK(Dali::PropertyTypes::Get<bool>() == Property::BOOLEAN);
   END_TEST;
 }
 
 int UtcDaliPropertyTypesGet03P(void)
 {
-  DALI_TEST_CHECK( Dali::PropertyTypes::Get<float>() == Property::FLOAT );
+  DALI_TEST_CHECK(Dali::PropertyTypes::Get<float>() == Property::FLOAT);
   END_TEST;
 }
 
 int UtcDaliPropertyTypesGet04P(void)
 {
-  DALI_TEST_CHECK( Dali::PropertyTypes::Get<int>() == Property::INTEGER );
+  DALI_TEST_CHECK(Dali::PropertyTypes::Get<int>() == Property::INTEGER);
   END_TEST;
 }
 
 int UtcDaliPropertyTypesGet06P(void)
 {
-  DALI_TEST_CHECK( Dali::PropertyTypes::Get<Dali::Vector2>() == Property::VECTOR2 );
+  DALI_TEST_CHECK(Dali::PropertyTypes::Get<Dali::Vector2>() == Property::VECTOR2);
   END_TEST;
 }
 
 int UtcDaliPropertyTypesGet07P(void)
 {
-  DALI_TEST_CHECK( Dali::PropertyTypes::Get<Dali::Vector3>() == Property::VECTOR3 );
+  DALI_TEST_CHECK(Dali::PropertyTypes::Get<Dali::Vector3>() == Property::VECTOR3);
   END_TEST;
 }
 
 int UtcDaliPropertyTypesGet08P(void)
 {
-  DALI_TEST_CHECK( Dali::PropertyTypes::Get<Dali::Vector4>() == Property::VECTOR4 );
+  DALI_TEST_CHECK(Dali::PropertyTypes::Get<Dali::Vector4>() == Property::VECTOR4);
   END_TEST;
 }
 
 int UtcDaliPropertyTypesGet09P(void)
 {
-  DALI_TEST_CHECK( Dali::PropertyTypes::Get<Dali::Matrix3>() == Property::MATRIX3 );
+  DALI_TEST_CHECK(Dali::PropertyTypes::Get<Dali::Matrix3>() == Property::MATRIX3);
   END_TEST;
 }
 
 int UtcDaliPropertyTypesGet10(void)
 {
-  DALI_TEST_CHECK( Dali::PropertyTypes::Get<Dali::Matrix>() == Property::MATRIX );
+  DALI_TEST_CHECK(Dali::PropertyTypes::Get<Dali::Matrix>() == Property::MATRIX);
   END_TEST;
 }
 
 int UtcDaliPropertyTypesGet11P(void)
 {
-  DALI_TEST_CHECK( Dali::PropertyTypes::Get<Dali::AngleAxis>() == Property::ROTATION );
+  DALI_TEST_CHECK(Dali::PropertyTypes::Get<Dali::AngleAxis>() == Property::ROTATION);
   END_TEST;
 }
 
 int UtcDaliPropertyTypesGet12P(void)
 {
-  DALI_TEST_CHECK( Dali::PropertyTypes::Get<Dali::Quaternion>() == Property::ROTATION );
+  DALI_TEST_CHECK(Dali::PropertyTypes::Get<Dali::Quaternion>() == Property::ROTATION);
   END_TEST;
 }
 
 int UtcDaliPropertyTypesGet13P(void)
 {
-  DALI_TEST_CHECK( Dali::PropertyTypes::Get<std::string>() == Property::STRING );
+  DALI_TEST_CHECK(Dali::PropertyTypes::Get<std::string>() == Property::STRING);
   END_TEST;
 }
 
 int UtcDaliPropertyTypesGet14P(void)
 {
-  DALI_TEST_CHECK( Dali::PropertyTypes::Get<Dali::Rect<int> >() == Property::RECTANGLE );
+  DALI_TEST_CHECK(Dali::PropertyTypes::Get<Dali::Rect<int> >() == Property::RECTANGLE);
   END_TEST;
 }
 
 int UtcDaliPropertyTypesGet15P(void)
 {
-  DALI_TEST_CHECK( Dali::PropertyTypes::Get<Dali::Property::Map>() == Property::MAP );
+  DALI_TEST_CHECK(Dali::PropertyTypes::Get<Dali::Property::Map>() == Property::MAP);
   END_TEST;
 }
 
 int UtcDaliPropertyTypesGet16P(void)
 {
-  DALI_TEST_CHECK( Dali::PropertyTypes::Get<Dali::Property::Array>() == Property::ARRAY );
+  DALI_TEST_CHECK(Dali::PropertyTypes::Get<Dali::Property::Array>() == Property::ARRAY);
   END_TEST;
 }