Conversion to Apache 2.0 license

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

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ControlImpl.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ControlImpl.cpp
index 4bc5808..5d0e4ab 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-ControlImpl.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ControlImpl.cpp
@@ -55,7 +55,7 @@ int UtcDaliControlImplNew(void)
 
   DALI_TEST_CHECK( !Control::DownCast(control) );
 
 
   DALI_TEST_CHECK( !Control::DownCast(control) );
 

-  control = ControlImpl::New();
+  control = Toolkit::Internal::Control::New();

 
   DALI_TEST_CHECK( Control::DownCast(control) );
   END_TEST;
 
   DALI_TEST_CHECK( Control::DownCast(control) );
   END_TEST;


@@ -653,13 +653,13 @@ int UtcDaliControlImplStyleChange(void)
   Actor actor = Actor::New();
   dummy.Add(actor);
 
   Actor actor = Actor::New();
   dummy.Add(actor);
 

-  DALI_TEST_EQUALS( dummyImpl.styleChangeCalled, false, TEST_LOCATION );
+  DALI_TEST_EQUALS( dummyImpl.fontChangeCalled, false, TEST_LOCATION );

   StyleChange styleChange;
   styleChange.defaultFontChange = true;
   Dali::StyleMonitor styleMonitor = application.GetAdaptor().GetToolkitStyleMonitor();
   styleMonitor.EmitStyleChangeSignal(styleChange);
 
   StyleChange styleChange;
   styleChange.defaultFontChange = true;
   Dali::StyleMonitor styleMonitor = application.GetAdaptor().GetToolkitStyleMonitor();
   styleMonitor.EmitStyleChangeSignal(styleChange);
 

-  DALI_TEST_EQUALS( dummyImpl.styleChangeCalled, true, TEST_LOCATION );
+  DALI_TEST_EQUALS( dummyImpl.fontChangeCalled, true, TEST_LOCATION );

 
   Stage::GetCurrent().Remove(dummy);
   END_TEST;
 
   Stage::GetCurrent().Remove(dummy);
   END_TEST;