X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit-unmanaged%2Futc-Dali-View.cpp;h=21a57df23cf8780af4afef4be0f3847bd14e4975;hb=refs%2Ftags%2Faccepted%2Ftizen%2Fcommon%2F20141222.090212;hp=c731668ec10e37c151c38e64dea70b6df5bf0180;hpb=998d982768c7f211d948cfd7921ec27ff739ce49;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git

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
--- 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;
   }