X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit-unmanaged%2Futc-Dali-CubeTransitionEffect.cpp;h=e584bb44c32bbc8717f7363dd6527635c32e69a3;hp=c08582aa7adb0184ddbadcf676aba95ea1114b93;hb=b05f1616f050416fb9537db0c0f3ea78e0b30b1f;hpb=30f6ca1e541089b19f2b349a8a12d8a5bcaf2f9e diff --git a/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-CubeTransitionEffect.cpp b/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-CubeTransitionEffect.cpp index c08582a..e584bb4 100644 --- a/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-CubeTransitionEffect.cpp +++ b/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-CubeTransitionEffect.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 #include @@ -120,7 +121,7 @@ int UtcDaliCubeTransitionWaveEffectNew(void) DALI_TEST_CHECK( waveEffect ); - waveEffect = NULL; + waveEffect.Reset(); //Additional check to ensure object is created by checking if it's registered ObjectRegistry registry = Stage::GetCurrent().GetObjectRegistry(); @@ -148,7 +149,7 @@ int UtcDaliCubeTransitionCrossEffectNew(void) DALI_TEST_CHECK( crossEffect ); - crossEffect = NULL; + crossEffect.Reset(); //Additional check to ensure object is created by checking if it's registered ObjectRegistry registry = Stage::GetCurrent().GetObjectRegistry(); @@ -176,7 +177,7 @@ int UtcDaliCubeTransitionFoldEffectNew(void) DALI_TEST_CHECK( foldEffect ); - foldEffect = NULL; + foldEffect.Reset(); //Additional check to ensure object is created by checking if it is registered ObjectRegistry registry = Stage::GetCurrent().GetObjectRegistry();