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-RadioButton.cpp;fp=automated-tests%2Fsrc%2Fdali-toolkit-unmanaged%2Futc-Dali-RadioButton.cpp;h=f6201e934bdde9dc8aae47a5ee75303618ec507e;hp=f3ff7b47d63321fa55c29f8cfc3458c454f04a95;hb=c803046c24398c2037a83d105a932976dede943f;hpb=c53a59521473d7362235aebf58c99b85734b83e6

diff --git a/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-RadioButton.cpp b/automated-tests/src/dali-toolkit/utc-Dali-RadioButton.cpp
similarity index 73%
rename from automated-tests/src/dali-toolkit-unmanaged/utc-Dali-RadioButton.cpp
rename to automated-tests/src/dali-toolkit/utc-Dali-RadioButton.cpp
index f3ff7b4..f6201e9 100644
--- a/automated-tests/src/dali-toolkit-unmanaged/utc-Dali-RadioButton.cpp
+++ b/automated-tests/src/dali-toolkit/utc-Dali-RadioButton.cpp
@@ -114,27 +114,27 @@ int UtcDaliRadioButtonActive(void)
   RadioButton radioButton = RadioButton::New();
 
   // Default active
-  DALI_TEST_CHECK( radioButton.IsActive() == false );
+  DALI_TEST_CHECK( radioButton.IsSelected() == false );
 
   // False to true
   radioButton.ToggleState();
-  DALI_TEST_CHECK( radioButton.IsActive() == true );
+  DALI_TEST_CHECK( radioButton.IsSelected() == true );
 
   // True to false
   radioButton.ToggleState();
-  DALI_TEST_CHECK( radioButton.IsActive() == false );
+  DALI_TEST_CHECK( radioButton.IsSelected() == false );
 
   // False
-  radioButton.SetActive( false );
-  DALI_TEST_CHECK( radioButton.IsActive() == false );
+  radioButton.SetSelected( false );
+  DALI_TEST_CHECK( radioButton.IsSelected() == false );
 
   // True
-  radioButton.SetActive( true );
-  DALI_TEST_CHECK( radioButton.IsActive() == true );
+  radioButton.SetSelected( true );
+  DALI_TEST_CHECK( radioButton.IsSelected() == true );
 
   // False
-  radioButton.SetActive( false );
-  DALI_TEST_CHECK( radioButton.IsActive() == false );
+  radioButton.SetSelected( false );
+  DALI_TEST_CHECK( radioButton.IsSelected() == false );
 
   END_TEST;
 }
@@ -152,19 +152,19 @@ int UtcDaliRadioButtonActiveProperty(void)
   radioButton.SetPosition( 0.0f, 0.0f );
 
   // Default active
-  DALI_TEST_CHECK( radioButton.GetProperty<bool>( RadioButton::PROPERTY_ACTIVE ) == false );
+  DALI_TEST_CHECK( radioButton.GetProperty<bool>( Button::PROPERTY_TOGGLED ) == false );
 
   // Setting false active
-  radioButton.SetProperty( RadioButton::PROPERTY_ACTIVE, false );
-  DALI_TEST_CHECK( radioButton.GetProperty<bool>( RadioButton::PROPERTY_ACTIVE ) == false );
+  radioButton.SetProperty( Button::PROPERTY_TOGGLED, false );
+  DALI_TEST_CHECK( radioButton.GetProperty<bool>( Button::PROPERTY_TOGGLED ) == false );
 
   // Setting true active
-  radioButton.SetProperty( RadioButton::PROPERTY_ACTIVE, true );
-  DALI_TEST_CHECK( radioButton.GetProperty<bool>( RadioButton::PROPERTY_ACTIVE ) == true );
+  radioButton.SetProperty( Button::PROPERTY_TOGGLED, true );
+  DALI_TEST_CHECK( radioButton.GetProperty<bool>( Button::PROPERTY_TOGGLED ) == true );
 
   // Setting false again
-  radioButton.SetProperty( RadioButton::PROPERTY_ACTIVE, false );
-  DALI_TEST_CHECK( radioButton.GetProperty<bool>( RadioButton::PROPERTY_ACTIVE ) == false );
+  radioButton.SetProperty( Button::PROPERTY_TOGGLED, false );
+  DALI_TEST_CHECK( radioButton.GetProperty<bool>( Button::PROPERTY_TOGGLED ) == false );
 
   // Test selecting radio buttons
   RadioButton radioButton2 = RadioButton::New( "label" );
@@ -191,8 +191,8 @@ int UtcDaliRadioButtonActiveProperty(void)
   application.Render();
 
   // Simulate touch events
-  DALI_TEST_CHECK( radioButton2.GetProperty<bool>( RadioButton::PROPERTY_ACTIVE ) == false );
-  DALI_TEST_CHECK( radioButton3.GetProperty<bool>( RadioButton::PROPERTY_ACTIVE ) == false );
+  DALI_TEST_CHECK( radioButton2.GetProperty<bool>( Button::PROPERTY_TOGGLED ) == false );
+  DALI_TEST_CHECK( radioButton3.GetProperty<bool>( Button::PROPERTY_TOGGLED ) == false );
 
   // Select first radio
   {
@@ -206,8 +206,8 @@ int UtcDaliRadioButtonActiveProperty(void)
     application.SendNotification();
     application.Render();
 
-    DALI_TEST_CHECK( radioButton2.GetProperty<bool>( RadioButton::PROPERTY_ACTIVE ) == true );
-    DALI_TEST_CHECK( radioButton3.GetProperty<bool>( RadioButton::PROPERTY_ACTIVE ) == false );
+    DALI_TEST_CHECK( radioButton2.GetProperty<bool>( Button::PROPERTY_TOGGLED ) == true );
+    DALI_TEST_CHECK( radioButton3.GetProperty<bool>( Button::PROPERTY_TOGGLED ) == false );
   }
 
   // Select an already selected radio
@@ -222,8 +222,8 @@ int UtcDaliRadioButtonActiveProperty(void)
     application.SendNotification();
     application.Render();
 
-    DALI_TEST_CHECK( radioButton2.GetProperty<bool>( RadioButton::PROPERTY_ACTIVE ) == true );
-    DALI_TEST_CHECK( radioButton3.GetProperty<bool>( RadioButton::PROPERTY_ACTIVE ) == false );
+    DALI_TEST_CHECK( radioButton2.GetProperty<bool>( Button::PROPERTY_TOGGLED ) == true );
+    DALI_TEST_CHECK( radioButton3.GetProperty<bool>( Button::PROPERTY_TOGGLED ) == false );
   }
 
   // Select second radio
@@ -238,8 +238,8 @@ int UtcDaliRadioButtonActiveProperty(void)
     application.SendNotification();
     application.Render();
 
-    DALI_TEST_CHECK( radioButton2.GetProperty<bool>( RadioButton::PROPERTY_ACTIVE ) == false );
-    DALI_TEST_CHECK( radioButton3.GetProperty<bool>( RadioButton::PROPERTY_ACTIVE ) == true );
+    DALI_TEST_CHECK( radioButton2.GetProperty<bool>( Button::PROPERTY_TOGGLED ) == false );
+    DALI_TEST_CHECK( radioButton3.GetProperty<bool>( Button::PROPERTY_TOGGLED ) == true );
   }
 
   // Select outside radio group
@@ -254,8 +254,8 @@ int UtcDaliRadioButtonActiveProperty(void)
     application.SendNotification();
     application.Render();
 
-    DALI_TEST_CHECK( radioButton2.GetProperty<bool>( RadioButton::PROPERTY_ACTIVE ) == false );
-    DALI_TEST_CHECK( radioButton3.GetProperty<bool>( RadioButton::PROPERTY_ACTIVE ) == true );
+    DALI_TEST_CHECK( radioButton2.GetProperty<bool>( Button::PROPERTY_TOGGLED ) == false );
+    DALI_TEST_CHECK( radioButton3.GetProperty<bool>( Button::PROPERTY_TOGGLED ) == true );
   }
 
   END_TEST;