(StyleManager) Add style monitor signal into StyleManager

[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..1e40bcc 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-ControlImpl.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-ControlImpl.cpp
@@ -1,19 +1,18 @@
-/*
- * Copyright (c) 2014 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.
- * You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
+//
+// Copyright (c) 2014 Samsung Electronics Co., Ltd.
+//
+// Licensed under the Flora License, Version 1.0 (the License);
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+//     http://floralicense.org/license/
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an AS IS BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+//
 
 #include <iostream>
 #include <stdlib.h>
@@ -55,7 +54,7 @@ int UtcDaliControlImplNew(void)
 
   DALI_TEST_CHECK( !Control::DownCast(control) );
 
-  control = ControlImpl::New();
+  control = Toolkit::Internal::Control::New();
 
   DALI_TEST_CHECK( Control::DownCast(control) );
   END_TEST;
@@ -653,13 +652,13 @@ int UtcDaliControlImplStyleChange(void)
   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);
 
-  DALI_TEST_EQUALS( dummyImpl.styleChangeCalled, true, TEST_LOCATION );
+  DALI_TEST_EQUALS( dummyImpl.fontChangeCalled, true, TEST_LOCATION );
 
   Stage::GetCurrent().Remove(dummy);
   END_TEST;