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-DefaultControls.cpp;h=b65fc34773142afa3065614ec8e5bca36b4fab9e;hp=a5c9a0bcbf64164f808986c1d49a8a57c97ef4bb;hb=7f36ca9572ba3086167d5238a7aff909b56a50f4;hpb=30f6ca1e541089b19f2b349a8a12d8a5bcaf2f9e

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-DefaultControls.cpp b/automated-tests/src/dali-toolkit/utc-Dali-DefaultControls.cpp
index a5c9a0b..b65fc34 100644
--- a/automated-tests/src/dali-toolkit/utc-Dali-DefaultControls.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-DefaultControls.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>
@@ -52,91 +53,3 @@ int UtcDaliDefaultControlsCreateSolidColorActor(void)
   DALI_TEST_CHECK(!image3);
   END_TEST;
 }
-
-int UtcDaliDefaultControlsCreatePushButton(void)
-{
-  ToolkitTestApplication application;
-
-  tet_infoline(" UtcDaliDefaultControlsCreatePushButton");
-
-  const std::string imagePath( "Facke image path" );
-  const std::string voidImagePath( "" );
-
-  ImageActor image = CreateSolidColorActor( Color::RED );
-  ImageActor voidImage;
-
-  PushButton button0, button1, button2, button3, button4, button5, button6;
-
-  try
-  {
-    button0 = CreatePushButton( voidImagePath, voidImagePath, voidImagePath, voidImagePath, voidImagePath );
-    button1 = CreatePushButton( imagePath, voidImagePath, voidImagePath, voidImagePath, voidImagePath );
-    button2 = CreatePushButton( voidImagePath, imagePath, voidImagePath, voidImagePath, voidImagePath );
-    button3 = CreatePushButton( voidImagePath, voidImagePath, imagePath, voidImagePath, voidImagePath );
-    button4 = CreatePushButton( voidImagePath, voidImagePath, voidImagePath, imagePath, voidImagePath );
-    button5 = CreatePushButton( voidImagePath, voidImagePath, voidImagePath, voidImagePath, imagePath );
-    button6 = CreatePushButton( imagePath, imagePath, imagePath, imagePath, imagePath );
-  }
-  catch( ... )
-  {
-    tet_result( TET_FAIL );
-  }
-
-  DALI_TEST_CHECK( button0 );
-  DALI_TEST_CHECK( button1 );
-  DALI_TEST_CHECK( button2 );
-  DALI_TEST_CHECK( button3 );
-  DALI_TEST_CHECK( button4 );
-  DALI_TEST_CHECK( button5 );
-  DALI_TEST_CHECK( button6 );
-
-  try
-  {
-    button0 = CreatePushButton( voidImage, voidImage, voidImage, voidImage, voidImage );
-    button1 = CreatePushButton( image, voidImage, voidImage, voidImage, voidImage );
-    button2 = CreatePushButton( voidImage, image, voidImage, voidImage, voidImage );
-    button3 = CreatePushButton( voidImage, voidImage, image, voidImage, voidImage );
-    button4 = CreatePushButton( voidImage, voidImage, voidImage, image, voidImage );
-    button5 = CreatePushButton( voidImage, voidImage, voidImage, voidImage, image );
-    button6 = CreatePushButton( image, image, image, image, image );
-  }
-  catch( ... )
-  {
-    tet_result( TET_FAIL );
-  }
-
-  DALI_TEST_CHECK( button0 );
-  DALI_TEST_CHECK( button1 );
-  DALI_TEST_CHECK( button2 );
-  DALI_TEST_CHECK( button3 );
-  DALI_TEST_CHECK( button4 );
-  DALI_TEST_CHECK( button5 );
-  DALI_TEST_CHECK( button6 );
-
-  try
-  {
-    button0 = CreatePushButton( voidImagePath );
-    button1 = CreatePushButton( imagePath );
-  }
-  catch( ... )
-  {
-    tet_result( TET_FAIL );
-  }
-
-  DALI_TEST_CHECK( button0 );
-  DALI_TEST_CHECK( button1 );
-
-  try
-  {
-    button0 = CreatePushButton( voidImage );
-    button1 = CreatePushButton( image );
-  }
-  catch( ... )
-  {
-    tet_result( TET_FAIL );
-  }
-
-  DALI_TEST_CHECK( button0 );
-  DALI_TEST_CHECK( button1 );
-  END_TEST;
-}