Merge "Added PathConstraint support to Javascript API" into tizen

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

diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp
index e7f9aa4..3a6900e 100644 (file)
--- a/automated-tests/src/dali-toolkit/utc-Dali-Button.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-Button.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>
@@ -75,7 +76,7 @@ int UtcDaliButtonNew(void)
 
   DALI_TEST_CHECK( pushButton2 );
 
-   pushButton2 = NULL;
+  pushButton2.Reset();
 
   // Test down cast
   Handle handleButton;
@@ -95,10 +96,10 @@ int UtcDaliButtonSetProperty(void)
 
   PushButton pushButton = PushButton::New();
 
-  pushButton.SetProperty(pushButton.GetPropertyIndex("dimmed"), false);
-  DALI_TEST_CHECK( false == pushButton.IsDimmed() );
-  pushButton.SetProperty(pushButton.GetPropertyIndex("dimmed"), true);
-  DALI_TEST_CHECK( true == pushButton.IsDimmed() );
+  pushButton.SetProperty(pushButton.GetPropertyIndex("disabled"), false);
+  DALI_TEST_CHECK( false == pushButton.IsDisabled() );
+  pushButton.SetProperty(pushButton.GetPropertyIndex("disabled"), true);
+  DALI_TEST_CHECK( true == pushButton.IsDisabled() );
   END_TEST;
 }
 
@@ -109,21 +110,21 @@ int UtcDaliButtonSetGetDimmed(void)
 
   PushButton pushButton = PushButton::New();
 
-  pushButton.SetDimmed( true );
+  pushButton.SetDisabled( true );
 
-  DALI_TEST_CHECK( pushButton.IsDimmed() );
+  DALI_TEST_CHECK( pushButton.IsDisabled() );
 
-  pushButton.SetDimmed( false );
+  pushButton.SetDisabled( false );
 
-  DALI_TEST_CHECK( !pushButton.IsDimmed() );
+  DALI_TEST_CHECK( !pushButton.IsDisabled() );
 
-  pushButton.SetDimmed( true );
+  pushButton.SetDisabled( true );
 
-  DALI_TEST_CHECK( pushButton.IsDimmed() );
+  DALI_TEST_CHECK( pushButton.IsDisabled() );
 
-  pushButton.SetDimmed( false );
+  pushButton.SetDisabled( false );
 
-  DALI_TEST_CHECK( !pushButton.IsDimmed() );
+  DALI_TEST_CHECK( !pushButton.IsDisabled() );
   END_TEST;
 }
 
@@ -132,7 +133,7 @@ int UtcDaliButtonSize(void)
   ToolkitTestApplication application;
   tet_infoline(" UtcDaliButtonSize");
 
-  ImageActor image01 = ImageActor::New(CreateBitmapImage());
+  ImageActor image01 = ImageActor::New(CreateBufferImage());
   image01.SetSize( 100, 50 );
 
   PushButton pushButton;