[Tizen] Fix TC code conflict

[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 9e1062d..168e9e3 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-SignalTemplatesFunctors.cpp
+++ b/automated-tests/src/dali/utc-Dali-SignalTemplatesFunctors.cpp
@@ -20,7 +20,7 @@
 #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;
@@ -42,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()
   {
@@ -189,6 +189,7 @@ struct FloatFunctorFloat
   }
 
   FloatFunctorFloat( const FloatFunctorFloat& copyMe )
+  : mLastReceivedValue (copyMe.mLastReceivedValue )
   {
     ++mTotalInstanceCount;
     ++mCurrentInstanceCount;
@@ -374,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 );