Merge remote-tracking branch 'origin/tizen' into new_text

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

diff --git a/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-View.cpp b/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-View.cpp
index c731668..21a57df 100644 (file)
--- a/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-View.cpp
+++ b/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-View.cpp
@@ -73,9 +73,9 @@ int UtcDaliViewNew(void)
   View view3 = view2;
   DALI_TEST_CHECK( view3 );
 
-  view1 = NULL;
-  view2 = NULL;
-  view3 = NULL;
+  view1.Reset();
+  view2.Reset();
+  view3.Reset();
 
   //Additional check to ensure object is created by checking if it's registered
   ObjectRegistry registry = Stage::GetCurrent().GetObjectRegistry();
@@ -189,8 +189,8 @@ int UtcDaliViewAddGetRemoveContentLayer02(void)
   }
   catch( DaliException& e )
   {
-    tet_printf("Assertion %s failed at %s when an unitialized layer is added.\n", e.mCondition.c_str(), e.mLocation.c_str());
-    DALI_TEST_EQUALS( e.mCondition, "layer", TEST_LOCATION );
+    DALI_TEST_PRINT_ASSERT( e );
+    DALI_TEST_EQUALS( e.condition, "layer", TEST_LOCATION );
   }
 
   // Test: get a layer which was not added before.
@@ -262,8 +262,8 @@ int UtcDaliViewSetGetBackgroundLayer02(void)
   }
   catch( DaliException& e )
   {
-    tet_printf("Assertion %s failed at %s when trying to add background to the view and the view is not on the stage.\n", e.mCondition.c_str(), e.mLocation.c_str());
-    DALI_TEST_EQUALS( e.mCondition, "mBackgroundLayer.OnStage()", TEST_LOCATION );
+    DALI_TEST_PRINT_ASSERT( e );
+    DALI_TEST_EQUALS( e.condition, "mBackgroundLayer.OnStage()", TEST_LOCATION );
     assert = true;
   }