Fix UTC prevent issue

Change-Id: I363185dac06354e7e3a3490dbbc6719798c51699

diff --git a/automated-tests/src/dali/utc-Dali-Any.cpp b/automated-tests/src/dali/utc-Dali-Any.cpp
index f516cf0..97155c9 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Any.cpp
+++ b/automated-tests/src/dali/utc-Dali-Any.cpp
@@ -268,6 +268,18 @@ int UtcDaliAnyGet(void)
   MyStruct* myStruct3 = myClass.GetPointer();
   const MyStruct* myStruct4 = myClass.GetPointer();
 
+  if( myStruct3 == NULL )
+  {
+    tet_result( TET_FAIL );
+    END_TEST;
+  }
+
+  if( myStruct4 == NULL )
+  {
+    tet_result( TET_FAIL );
+    END_TEST;
+  }
+
   DALI_TEST_EQUALS( myStruct1.mFloatValue, 3.25f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
   DALI_TEST_EQUALS( myStruct2.mFloatValue, 3.25f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
   DALI_TEST_EQUALS( myStruct3->mFloatValue, 3.25f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );

diff --git a/automated-tests/src/dali/utc-Dali-ConnectionTracker.cpp b/automated-tests/src/dali/utc-Dali-ConnectionTracker.cpp
index a246746..c5bfa87 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-ConnectionTracker.cpp
+++ b/automated-tests/src/dali/utc-Dali-ConnectionTracker.cpp
@@ -77,6 +77,8 @@ int UtcConnectionTrackerDestructorP(void)
   // testApp out of scope it should have been disconnected
   DALI_TEST_CHECK( button->DownSignal().GetConnectionCount( ) == 0 );
 
+  delete button;
+
   END_TEST;
 }
 
@@ -94,6 +96,8 @@ int UtcConnectionTrackerDisconnectAllP(void)
 
   DALI_TEST_CHECK( button->DownSignal().GetConnectionCount( ) == 0 );
 
+  delete button;
+
   END_TEST;
 }
 
@@ -107,6 +111,8 @@ int UtcConnectionTrackerDisconnectAllN(void)
   testApp.DisconnectAll();
   DALI_TEST_CHECK( button->DownSignal().GetConnectionCount( ) == 0 );
 
+  delete button;
+
   END_TEST;
 }
 
@@ -120,6 +126,8 @@ int UtcConnectionTrackerSignalConnectedP(void)
 
   DALI_TEST_CHECK( button->DownSignal().GetConnectionCount( ) == 1 );
 
+  delete button;
+
   END_TEST;
 
 }
@@ -142,6 +150,8 @@ int UtcConnectionTrackerSignalConnectedN(void)
     tet_result(TET_PASS);
   }
 
+  delete button;
+
   END_TEST;
 }
 
@@ -159,8 +169,9 @@ int UtcConnectionTrackerSignalDisconnectP(void)
   button->DownSignal().Disconnect(&testApp,&TestApp::OnButtonPress);
   DALI_TEST_CHECK( button->DownSignal().GetConnectionCount( ) == 0 );
 
-  END_TEST;
+  delete button;
 
+  END_TEST;
 }
 
 
@@ -184,8 +195,9 @@ int UtcConnectionTrackerSignalDisconnectN(void)
     tet_result( TET_PASS );
   }
 
-  END_TEST;
+  delete button;
 
+  END_TEST;
 }
 
 
@@ -197,6 +209,9 @@ int UtcConnectionTrackerGetConnectionCountP(void)
   TestApp testApp;
   button->DownSignal().Connect(&testApp,&TestApp::OnButtonPress);
   DALI_TEST_CHECK( button->DownSignal().GetConnectionCount( ) == 1 );
+
+  delete button;
+
   END_TEST;
 }
 
@@ -206,5 +221,8 @@ int UtcConnectionTrackerGetConnectionCountN(void)
 
   TestButton* button = new TestButton(1);
   DALI_TEST_CHECK( button->DownSignal().GetConnectionCount( ) == 0 );
+
+  delete button;
+
   END_TEST;
 }

diff --git a/automated-tests/src/dali/utc-Dali-Vector.cpp b/automated-tests/src/dali/utc-Dali-Vector.cpp
index 0cf200d..fa185f5 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Vector.cpp
+++ b/automated-tests/src/dali/utc-Dali-Vector.cpp
@@ -717,7 +717,6 @@ int UtcDaliVectorAcidTest(void)
   int* ptr = NULL;
   for( unsigned int i = 0; i < acidCount; ++i )
   {
-    ++ptr;
     pairvector.PushBack( std::make_pair( i, i ) );
     doublevector.PushBack( (double)i );
     intptrvector.PushBack( (int*)ptr );

diff --git a/automated-tests/src/dali/utc-Dali-Vector2.cpp b/automated-tests/src/dali/utc-Dali-Vector2.cpp
index 822a6ae..c01686c 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Vector2.cpp
+++ b/automated-tests/src/dali/utc-Dali-Vector2.cpp
@@ -390,7 +390,6 @@ int UtcDaliVector2OperatorSubscriptN(void)
   try
   {
     float& w = testVector[4];
-    if(w==0.0f);
     tet_result(TET_FAIL);
   }
   catch (Dali::DaliException& e)
@@ -421,7 +420,6 @@ int UtcDaliVector2OperatorConstSubscriptN(void)
   try
   {
     const float& w = testVector2[4];
-    if(w==0.0f);
     tet_result(TET_FAIL);
   }
   catch (Dali::DaliException& e)

diff --git a/automated-tests/src/dali/utc-Dali-Vector3.cpp b/automated-tests/src/dali/utc-Dali-Vector3.cpp
index f96a7b2..b975b04 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Vector3.cpp
+++ b/automated-tests/src/dali/utc-Dali-Vector3.cpp
@@ -379,7 +379,6 @@ int UtcDaliVector3ConstOperatorSubscriptP(void)
   try
   {
     float& w = testVector[4];
-    if(w==0.0f);
     tet_result(TET_FAIL);
   }
   catch (Dali::DaliException& e)
@@ -391,7 +390,6 @@ int UtcDaliVector3ConstOperatorSubscriptP(void)
   try
   {
     const float& w = testVector2[4];
-    if(w==0.0f);
     tet_result(TET_FAIL);
   }
   catch (Dali::DaliException& e)

diff --git a/automated-tests/src/dali/utc-Dali-Vector4.cpp b/automated-tests/src/dali/utc-Dali-Vector4.cpp
index e83f0d9..1073ccf 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Vector4.cpp
+++ b/automated-tests/src/dali/utc-Dali-Vector4.cpp
@@ -373,7 +373,6 @@ int UtcDaliVector4ConstOperatorSubscriptP(void)
   try
   {
     float& w = testVector[4];
-    if(w==0.0f);
     tet_result(TET_FAIL);
   }
   catch (Dali::DaliException& e)
@@ -385,7 +384,6 @@ int UtcDaliVector4ConstOperatorSubscriptP(void)
   try
   {
     const float& w = testVector2[4];
-    if(w==0.0f);
     tet_result(TET_FAIL);
   }
   catch (Dali::DaliException& e)