Merge "Update the prefered size in OnNotifyDefaultPropertyAnimation" into devel/master

[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 2064909..97c433d 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) 2018 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.
@@ -23,15 +23,12 @@
 
 using namespace Dali;
 
-DALI_IMPORT_API const char* const GetName(Property::Type type);
-
 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( "UNSIGNED_INTEGER",   Dali::PropertyTypes::GetName(Property::UNSIGNED_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 );
@@ -63,12 +60,6 @@ int UtcDaliPropertyTypesGet04P(void)
   END_TEST;
 }
 
-int UtcDaliPropertyTypesGet05P(void)
-{
-  DALI_TEST_CHECK( Dali::PropertyTypes::Get<unsigned int>() == Property::UNSIGNED_INTEGER );
-  END_TEST;
-}
-
 int UtcDaliPropertyTypesGet06P(void)
 {
   DALI_TEST_CHECK( Dali::PropertyTypes::Get<Dali::Vector2>() == Property::VECTOR2 );