Merge branch 'devel/master' into tizen

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

diff --git a/automated-tests/src/dali/utc-Dali-Any.cpp b/automated-tests/src/dali/utc-Dali-Any.cpp
index f516cf0..843bc8a 100644 (file)
--- a/automated-tests/src/dali/utc-Dali-Any.cpp
+++ b/automated-tests/src/dali/utc-Dali-Any.cpp
@@ -117,11 +117,9 @@ int UtcDaliAnyAssignmentOperators(void)
 
   DALI_TEST_EQUALS( fValue, 4.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
 
-  Any value2 = 0.f;
+  value1 = 9.f; // Test operator=( const Type& ).
 
-  value2 = 9.f; // Test operator=( const Type& ).
-
-  value2.Get( fValue );
+  value1.Get( fValue );
 
   DALI_TEST_EQUALS( fValue, 9.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION );
 
@@ -268,6 +266,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 );