X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-DissolveEffect.cpp;h=66a36642f3017da4b8225b7f8a78ed21f12016cb;hp=799bad19bb501add5ad1d82e6f63a2506406cc7f;hb=d04c5bdbb95cc98f90848c7a98b0b2804df6e5b8;hpb=30f6ca1e541089b19f2b349a8a12d8a5bcaf2f9e

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-DissolveEffect.cpp b/automated-tests/src/dali-toolkit/utc-Dali-DissolveEffect.cpp
index 799bad1..66a3664 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-DissolveEffect.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-DissolveEffect.cpp
@@ -1,18 +1,19 @@
-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-//     http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
 
 #include <iostream>
 #include <stdlib.h>
@@ -53,7 +54,7 @@ int UtcDaliDissolveUninitializedEffect(void)
   catch (Dali::DaliException& e)
   {
     // Tests that a negative test of an assertion succeeds
-    tet_printf("Assertion %s failed at %s\n", e.mCondition.c_str(), e.mLocation.c_str());
+    DALI_TEST_PRINT_ASSERT( e );
     DALI_TEST_CHECK(!effect);
   }
   END_TEST;
@@ -80,7 +81,7 @@ int UtcDaliDissolveDefaultValuesEffect(void)
   Toolkit::DissolveEffect effect = Toolkit::DissolveEffect::New();
   DALI_TEST_CHECK( effect );
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );
@@ -105,7 +106,7 @@ int UtcDaliDissolveCustomValuesEffect(void)
   Toolkit::DissolveEffect effect = Toolkit::DissolveEffect::New();
   DALI_TEST_CHECK( effect );
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );
@@ -132,10 +133,10 @@ int UtcDaliSetEffectImageEffect(void)
   Toolkit::DissolveEffect effect = Toolkit::DissolveEffect::New();
   DALI_TEST_CHECK( effect );
 
-  Image effectImage = CreateBitmapImage();
+  Image effectImage = CreateBufferImage();
   effect.SetEffectImage(effectImage);
 
-  BitmapImage image = CreateBitmapImage();
+  BufferImage image = CreateBufferImage();
 
   ImageActor actor = ImageActor::New( image );
   actor.SetSize( 100.0f, 100.0f );