fix failing tests: 2 incorrect test cases 1 memory leak in dali core

[Problem]
[Cause]
[Solution]

Change-Id: I0b5196756ce3716013eb944c955e7d51cdf4469c

diff --git a/automated-tests/src/dali/utc-Dali-ShaderEffect.cpp b/automated-tests/src/dali/utc-Dali-ShaderEffect.cpp
index 1fa2684..ea20a92 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-ShaderEffect.cpp
+++ b/automated-tests/src/dali/utc-Dali-ShaderEffect.cpp
@@ -516,7 +516,10 @@ int UtcDaliShaderEffectMethodSetEffectImage(void)
   application.Render(16);
   application.SendNotification();
 
-  DALI_TEST_CHECK( application.GetGlAbstraction().CheckUniformValue( "sEffect", 1 ) );
+  GLuint programId, uniformId;
+  bool uniformWasSet = application.GetGlAbstraction().GetUniformIds( "sEffect", programId, uniformId );
+  // we dont care about the value of the sampler uniform as thats internal to DALi core and subject to change
+  DALI_TEST_CHECK( uniformWasSet );
   END_TEST;
 }
 

diff --git a/automated-tests/src/dali/utc-Dali-SignalTemplatesV2.cpp b/automated-tests/src/dali/utc-Dali-SignalTemplatesV2.cpp
index 99bdab8..25098cd 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-SignalTemplatesV2.cpp
+++ b/automated-tests/src/dali/utc-Dali-SignalTemplatesV2.cpp
@@ -823,11 +823,11 @@ public:
 
   ~TestBasicConnectionTrackerInterface()
   {
-    if( mCallback )
+    if( mSlotObserver && mCallback )
     {
       // Notify signal since the slot has been destroyed
       mSlotObserver->SlotDisconnected( mCallback );
-      delete mCallback;
+      // mCallback and mSlotObserver are not owned
     }
   }
 
@@ -871,9 +871,8 @@ public:
     if( mSlotObserver == slotObserver )
     {
       mSlotObserver = NULL;
-
-      delete mCallback;
       mCallback = NULL;
+      // mCallback and mSlotObserver are not owned
     }
   }
 

diff --git a/dali/public-api/signals/connection-tracker-interface.h b/dali/public-api/signals/connection-tracker-interface.h
index cf011f0..a113407 100644 (file)
--- a/dali/public-api/signals/connection-tracker-interface.h
+++ b/dali/public-api/signals/connection-tracker-interface.h
@@ -63,8 +63,8 @@ public:
   /**
    * @brief Called when a signal is connected.
    *
-   * @param[in] slotObserver The slot observer i.e. a signal.
-   * @param[in] callback The call back.
+   * @param[in] slotObserver The slot observer i.e. a signal. Ownership is not passed.
+   * @param[in] callback The call back. Ownership is not passed.
    */
   virtual void SignalConnected( SlotObserver* slotObserver, CallbackBase* callback ) = 0;
 

diff --git a/dali/public-api/signals/signal-slot-connections.cpp b/dali/public-api/signals/signal-slot-connections.cpp
index ab22e09..531d286 100644 (file)
--- a/dali/public-api/signals/signal-slot-connections.cpp
+++ b/dali/public-api/signals/signal-slot-connections.cpp
@@ -71,6 +71,8 @@ void SignalConnection::Disconnect( SlotObserver* slotObserver )
     mSignalObserver = NULL;
   }
 
+  // we own the callback, SignalObserver is expected to delete the SlotConnection on Disconnected so its pointer to our mCallback is no longer used
+  delete mCallback;
   mCallback = NULL;
 }