Remove RenderSurface from Core

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

diff --git a/automated-tests/src/dali/utc-Dali-SignalTemplatesFunctors.cpp b/automated-tests/src/dali/utc-Dali-SignalTemplatesFunctors.cpp
index 4c98209..168e9e3 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-SignalTemplatesFunctors.cpp
+++ b/automated-tests/src/dali/utc-Dali-SignalTemplatesFunctors.cpp
@@ -1,25 +1,26 @@
-//
-// 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.
-//
+/*
+ * 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.
+ *
+ */
 
 // EXTERNAL INCLUDES
 #include <iostream>
 #include <stdlib.h>
 
 // INTERNAL INCLUDES
-#include <dali/dali.h>
+#include <dali/public-api/dali-core.h>
 #include <dali-test-suite-utils.h>
 
 using namespace Dali;
@@ -41,11 +42,11 @@ class TestSignals
 {
 public:
 
-  typedef SignalV2<void ()> VoidSignalVoid;
-  typedef SignalV2<void (float)> VoidSignalFloat;
+  typedef Signal<void ()> VoidSignalVoid;
+  typedef Signal<void (float)> VoidSignalFloat;
 
-  typedef SignalV2<float ()> FloatSignalVoid;
-  typedef SignalV2<float (float)> FloatSignalFloat;
+  typedef Signal<float ()> FloatSignalVoid;
+  typedef Signal<float (float)> FloatSignalFloat;
 
   TestSignals()
   {
@@ -188,6 +189,7 @@ struct FloatFunctorFloat
   }
 
   FloatFunctorFloat( const FloatFunctorFloat& copyMe )
+  : mLastReceivedValue (copyMe.mLastReceivedValue )
   {
     ++mTotalInstanceCount;
     ++mCurrentInstanceCount;
@@ -373,7 +375,6 @@ int UtcDaliSignalFunctorsEmitReturn(void)
     DALI_TEST_EQUALS( returnValue, FloatFunctorVoid::DEFAULT_RETURN_VALUE, TEST_LOCATION );
 
     // Test double emission
-    returnValue = 0.0f;
     returnValue = signals.mFloatSignalVoid.Emit();
     DALI_TEST_EQUALS( FloatFunctorVoid::mCallbackCount, 2, TEST_LOCATION );
     DALI_TEST_EQUALS( returnValue, FloatFunctorVoid::DEFAULT_RETURN_VALUE, TEST_LOCATION );