Revert "[Tizen] Appendix log for ttrace + Print keycode and timestamp"

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

diff --git a/automated-tests/src/dali/utc-Dali-CSharp-TypeRegistry.cpp b/automated-tests/src/dali/utc-Dali-CSharp-TypeRegistry.cpp
index bf97f9f..bf4a348 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-CSharp-TypeRegistry.cpp
+++ b/automated-tests/src/dali/utc-Dali-CSharp-TypeRegistry.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 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,24 +15,23 @@
  *
  */
 
-#include <iostream>
-#include <stdlib.h>
-#include <limits>
-#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 #include <dali/devel-api/object/csharp-type-info.h>
 #include <dali/devel-api/object/csharp-type-registry.h>
 #include <dali/internal/event/common/type-registry-impl.h>
+#include <dali/public-api/dali-core.h>
 #include <dali/public-api/object/property.h>
-using namespace Dali;
+#include <stdlib.h>
 
+#include <iostream>
+#include <limits>
+using namespace Dali;
 
 namespace
 {
-
-
 static bool CreateCustomNamedInitCalled = false;
-BaseHandle* CreateCustomNamedInit(void)
+
+BaseHandle* CreateCustomNamedInit(const char* const typeName)
 {
   CreateCustomNamedInitCalled = true;
 
@@ -44,48 +43,50 @@ BaseHandle* CreateCustomNamedInit(void)
 // Property Registration
 bool setPropertyCalled = false;
 bool getPropertyCalled = false;
-int intPropertyValue = 0;
-void SetProperty( BaseObject* object, Property::Index* index, Property::Value* value )
-{
+int  intPropertyValue  = 0;
 
-  value->Get( intPropertyValue );
+void SetProperty(BaseObject* object, const char* const propertyName, Property::Value* value)
+{
+  value->Get(intPropertyValue);
 
   setPropertyCalled = true;
 }
-Property::Value* GetProperty( BaseObject* object, Property::Index* index )
+
+Property::Value* GetProperty(BaseObject* object, const char* const propertyName)
 {
-  getPropertyCalled = true;
-  Property::Value* x = new Property::Value( 10 );
+  getPropertyCalled  = true;
+  Property::Value* x = new Property::Value(10);
   return x;
 }
 
-}
+} // namespace
 
 int UtcDaliRegisterCSharpTypeP(void)
 {
-
   TestApplication application;
 
-  CSharpTypeRegistry::RegisterType( "CSharpControl", typeid( Dali::Actor), &CreateCustomNamedInit, true );
+  CSharpTypeRegistry::RegisterType("CSharpControl", typeid(Dali::Actor), &CreateCustomNamedInit);
 
-  GetImplementation(Dali::TypeRegistry::Get()).CallInitFunctions();
+  Dali::TypeInfo info = Dali::TypeRegistry::Get().GetTypeInfo("CSharpControl");
 
-  DALI_TEST_EQUALS( CreateCustomNamedInitCalled, true, TEST_LOCATION );
+  info.CreateInstance();
+
+  DALI_TEST_EQUALS(CreateCustomNamedInitCalled, true, TEST_LOCATION);
 
   END_TEST;
 }
 
 int UtcDaliRegisterCSharpTypeNoInitP(void)
 {
-
   TestApplication application;
+
   CreateCustomNamedInitCalled = false;
 
-  CSharpTypeRegistry::RegisterType( "CSharpControl", typeid( Dali::Actor), &CreateCustomNamedInit, false);
+  CSharpTypeRegistry::RegisterType("CSharpControl", typeid(Dali::Actor), &CreateCustomNamedInit);
 
   GetImplementation(Dali::TypeRegistry::Get()).CallInitFunctions();
 
-  DALI_TEST_EQUALS( CreateCustomNamedInitCalled, false, TEST_LOCATION );
+  DALI_TEST_EQUALS(CreateCustomNamedInitCalled, false, TEST_LOCATION);
 
   END_TEST;
 }
@@ -94,17 +95,17 @@ int UtcDaliRegisterCSharpTypeN(void)
 {
   TestApplication application;
 
-  CSharpTypeRegistry::RegisterType( "CSharpControl", typeid( Dali::Actor), &CreateCustomNamedInit, true );
+  CSharpTypeRegistry::RegisterType("CSharpControl", typeid(Dali::Actor), &CreateCustomNamedInit);
 
   // should cause an assert because we're registering same type twice
   try
   {
-    CSharpTypeRegistry::RegisterType( "CSharpControl", typeid( Dali::Actor), &CreateCustomNamedInit, true );
-    tet_result( TET_FAIL );
+    CSharpTypeRegistry::RegisterType("CSharpControl", typeid(Dali::Actor), &CreateCustomNamedInit);
+    tet_result(TET_FAIL);
   }
-  catch ( DaliException& e )
+  catch(DaliException& e)
   {
-    DALI_TEST_ASSERT( e, "Duplicate type name for Type Registation", TEST_LOCATION );
+    DALI_TEST_ASSERT(e, "Duplicate type name in Type Registration", TEST_LOCATION);
   }
 
   END_TEST;
@@ -112,80 +113,69 @@ int UtcDaliRegisterCSharpTypeN(void)
 
 int UtcDaliRegisterCSharpTypeCreateP(void)
 {
-
   TestApplication application;
   CreateCustomNamedInitCalled = false;
 
-  CSharpTypeRegistry::RegisterType( "CSharpControl", typeid( Dali::Actor), &CreateCustomNamedInit, false);
-
-
-  TypeInfo info = Dali::TypeRegistry::Get().GetTypeInfo( "CSharpControl");
-
+  CSharpTypeRegistry::RegisterType("CSharpControl", typeid(Dali::Actor), &CreateCustomNamedInit);
 
+  TypeInfo info = Dali::TypeRegistry::Get().GetTypeInfo("CSharpControl");
 
   BaseHandle handle = info.CreateInstance();
 
-  DALI_TEST_EQUALS( CreateCustomNamedInitCalled, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(CreateCustomNamedInitCalled, true, TEST_LOCATION);
 
   END_TEST;
 }
 
-
-
 int UtcDaliRegisterCSharpPropertyP(void)
 {
   TestApplication application;
 
-  CSharpTypeRegistry::RegisterType( "DateControl", typeid( Dali::Actor), &CreateCustomNamedInit, true );
-
+  CSharpTypeRegistry::RegisterType("DateControl", typeid(Dali::Actor), &CreateCustomNamedInit);
 
-  bool registered = CSharpTypeRegistry::RegisterProperty( "DateControl",
-                    "year",
-                    10000 + 1,
-                    Property::INTEGER,
-                    SetProperty,
-                    GetProperty );
-
-  DALI_TEST_EQUALS( registered, true, TEST_LOCATION );
+  bool registered = CSharpTypeRegistry::RegisterProperty("DateControl",
+                                                         "year",
+                                                         10000 + 1,
+                                                         Property::INTEGER,
+                                                         SetProperty,
+                                                         GetProperty);
 
+  DALI_TEST_EQUALS(registered, true, TEST_LOCATION);
 
   END_TEST;
 }
 
-
 int UtcDaliRegisterCSharpPropertyN(void)
 {
   TestApplication application;
 
   // register the same property twice
-  CSharpTypeRegistry::RegisterType( "DateControl", typeid( Dali::Actor), &CreateCustomNamedInit, true );
+  CSharpTypeRegistry::RegisterType("DateControl", typeid(Dali::Actor), &CreateCustomNamedInit);
 
+  bool registered = CSharpTypeRegistry::RegisterProperty("DateControl",
+                                                         "year",
+                                                         10000 + 1,
+                                                         Property::INTEGER,
+                                                         SetProperty,
+                                                         GetProperty);
 
-  bool registered = CSharpTypeRegistry::RegisterProperty( "DateControl",
-                    "year",
-                    10000 + 1,
-                    Property::INTEGER,
-                    SetProperty,
-                    GetProperty );
-
-  DALI_TEST_EQUALS( registered, true, TEST_LOCATION );
-
+  DALI_TEST_EQUALS(registered, true, TEST_LOCATION);
 
   // should fail second time with an assert as the property is already registered
   try
   {
-    registered = CSharpTypeRegistry::RegisterProperty( "DateControl",
-                      "year",
-                      10000 + 1,
-                      Property::INTEGER,
-                      SetProperty,
-                      GetProperty );
-
-    tet_result( TET_FAIL );
+    registered = CSharpTypeRegistry::RegisterProperty("DateControl",
+                                                      "year",
+                                                      10000 + 1,
+                                                      Property::INTEGER,
+                                                      SetProperty,
+                                                      GetProperty);
+
+    tet_result(TET_FAIL);
   }
-  catch ( DaliException& e )
+  catch(DaliException& e)
   {
-    DALI_TEST_ASSERT( e, "Property index already added to Type", TEST_LOCATION );
+    DALI_TEST_ASSERT(e, "Property index already added to Type", TEST_LOCATION);
   }
 
   END_TEST;
@@ -195,84 +185,82 @@ int UtcDaliRegisterCSharpPropertySetP(void)
 {
   TestApplication application;
 
-   // register the same property twice
-   CSharpTypeRegistry::RegisterType( "DateControl", typeid( Dali::Actor), &CreateCustomNamedInit, true );
-
-   Property::Index index(100001);
+  // register the same property twice
+  CSharpTypeRegistry::RegisterType("DateControl", typeid(Dali::Actor), &CreateCustomNamedInit);
+  ;
 
-   CSharpTypeRegistry::RegisterProperty( "DateControl",
-                     "year",
-                     index,
-                     Property::INTEGER,
-                     SetProperty,
-                     GetProperty );
+  Property::Index index(100001);
 
-   TypeRegistry typeRegistry = TypeRegistry::Get();
+  CSharpTypeRegistry::RegisterProperty("DateControl",
+                                       "year",
+                                       index,
+                                       Property::INTEGER,
+                                       SetProperty,
+                                       GetProperty);
 
-   TypeInfo typeInfo = TypeRegistry::Get().GetTypeInfo( "DateControl" );
+  TypeRegistry typeRegistry = TypeRegistry::Get();
 
+  TypeInfo typeInfo = TypeRegistry::Get().GetTypeInfo("DateControl");
 
-   // Check the property is writable in the type registry
-   Internal::TypeInfo& typeInfoImpl = GetImplementation( typeInfo );
+  // Check the property is writable in the type registry
+  Internal::TypeInfo& typeInfoImpl = GetImplementation(typeInfo);
 
-   Property::Value value(25);
+  Property::Value value(25);
 
-   typeInfoImpl.SetProperty( NULL, index, value );
+  typeInfoImpl.SetProperty(NULL, index, value);
 
-   DALI_TEST_EQUALS( 25, intPropertyValue , TEST_LOCATION );
+  DALI_TEST_EQUALS(25, intPropertyValue, TEST_LOCATION);
 
-   Property::Value value2(50);
+  Property::Value value2(50);
 
-   typeInfoImpl.SetProperty( NULL, "year", value2 );
+  typeInfoImpl.SetProperty(NULL, "year", value2);
 
-   DALI_TEST_EQUALS( 50, intPropertyValue , TEST_LOCATION );
+  DALI_TEST_EQUALS(50, intPropertyValue, TEST_LOCATION);
 
-   DALI_TEST_EQUALS( setPropertyCalled, true, TEST_LOCATION );
+  DALI_TEST_EQUALS(setPropertyCalled, true, TEST_LOCATION);
 
-   END_TEST;
+  END_TEST;
 }
 
-
 int UtcDaliRegisterCSharpPropertyGetP(void)
 {
   TestApplication application;
 
-   // register the same property twice
-   CSharpTypeRegistry::RegisterType( "DateControl", typeid( Dali::Actor), &CreateCustomNamedInit, true );
-
-   Property::Index index(100001);
+  // register the same property twice
+  CSharpTypeRegistry::RegisterType("DateControl", typeid(Dali::Actor), &CreateCustomNamedInit);
 
-   CSharpTypeRegistry::RegisterProperty( "DateControl",
-                     "year",
-                     index,
-                     Property::INTEGER,
-                     SetProperty,
-                     GetProperty );
+  Property::Index index(100001);
 
-   TypeRegistry typeRegistry = TypeRegistry::Get();
+  CSharpTypeRegistry::RegisterProperty("DateControl",
+                                       "year",
+                                       index,
+                                       Property::INTEGER,
+                                       SetProperty,
+                                       GetProperty);
 
-   TypeInfo typeInfo = TypeRegistry::Get().GetTypeInfo( "DateControl" );
+  TypeRegistry typeRegistry = TypeRegistry::Get();
 
+  TypeInfo typeInfo = TypeRegistry::Get().GetTypeInfo("DateControl");
 
-   // Check the property is writable in the type registry
-   Internal::TypeInfo& typeInfoImpl = GetImplementation( typeInfo );
+  // Check the property is writable in the type registry
+  Internal::TypeInfo& typeInfoImpl = GetImplementation(typeInfo);
 
-   Property::Value value(1);
+  Property::Value value(1);
 
-   value = typeInfoImpl.GetProperty( NULL, index );
+  value = typeInfoImpl.GetProperty(NULL, index);
 
-   int propValue;
-   value.Get( propValue );
+  int propValue;
+  value.Get(propValue);
 
-   DALI_TEST_EQUALS( getPropertyCalled, true, TEST_LOCATION );
-   DALI_TEST_EQUALS( propValue, 10, TEST_LOCATION );
+  DALI_TEST_EQUALS(getPropertyCalled, true, TEST_LOCATION);
+  DALI_TEST_EQUALS(propValue, 10, TEST_LOCATION);
 
-   value = typeInfoImpl.GetProperty( NULL, "year");
-   value.Get( propValue );
+  value = typeInfoImpl.GetProperty(NULL, "year");
+  value.Get(propValue);
 
-   DALI_TEST_EQUALS( propValue, 10, TEST_LOCATION );
+  DALI_TEST_EQUALS(propValue, 10, TEST_LOCATION);
 
-   END_TEST;
+  END_TEST;
 }
 
 int UtcDaliRegisterCSharpPropertyNotRegisteredN(void)
@@ -280,15 +268,14 @@ int UtcDaliRegisterCSharpPropertyNotRegisteredN(void)
   TestApplication application;
 
   // control not registered, should fail
-  bool registered = CSharpTypeRegistry::RegisterProperty( "DateControl",
-                    "year",
-                    10000 + 1,
-                    Property::INTEGER,
-                    SetProperty,
-                    GetProperty );
+  bool registered = CSharpTypeRegistry::RegisterProperty("DateControl",
+                                                         "year",
+                                                         10000 + 1,
+                                                         Property::INTEGER,
+                                                         SetProperty,
+                                                         GetProperty);
 
-  DALI_TEST_EQUALS( registered, false, TEST_LOCATION );
+  DALI_TEST_EQUALS(registered, false, TEST_LOCATION);
 
   END_TEST;
 }
-