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;h=ce5881c942ce298cc64ef0bd76d1d4f0a3006a83;hp=85cced6a9dc0a45dd79a77190a7e807f10b80d6e;hb=refs%2Fchanges%2F99%2F210399%2F9;hpb=611c65adb7d515fffbcd51be4874c203b0313446 diff --git a/automated-tests/src/dali-toolkit/utc-Dali-RadioButton.cpp b/automated-tests/src/dali-toolkit/utc-Dali-RadioButton.cpp index 85cced6..ce5881c 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-RadioButton.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-RadioButton.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 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. @@ -21,8 +21,6 @@ #include #include -#include -#include using namespace Dali; using namespace Dali::Toolkit; @@ -164,7 +162,7 @@ int UtcDaliRadioButtonLabelProperty(void) RadioButton radioButton = RadioButton::New(); radioButton.SetProperty( Toolkit::Button::Property::LABEL, - Property::Map().Add( Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::TEXT ) + Property::Map().Add( Toolkit::Visual::Property::TYPE, Toolkit::Visual::TEXT ) .Add( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f ) ); @@ -336,56 +334,4 @@ int UtcDaliRadioButtonSelectedProperty(void) } END_TEST; -} - - -// Deprecated API Tests - -int UtcDaliRadioButtonLabelActor(void) -{ - ToolkitTestApplication application; - - std::string labelText = "test actor 1"; - - RadioButton radioButton = RadioButton::New(); - - radioButton.SetProperty( Toolkit::Button::Property::LABEL, - Property::Map().Add( Toolkit::Visual::Property::TYPE, Toolkit::DevelVisual::TEXT ) - .Add( Toolkit::TextVisual::Property::POINT_SIZE, 15.0f ) - ); - - radioButton.SetLabelText( labelText ); - - DALI_TEST_EQUALS( radioButton.GetLabelText(), labelText, TEST_LOCATION ); - - std::string labelText2 = "test actor 2"; - radioButton.SetLabelText( labelText2 ); - DALI_TEST_EQUALS( radioButton.GetLabelText(), labelText2, TEST_LOCATION ); - - END_TEST; -} - -int UtcDaliRadioButtonSelected(void) -{ - ToolkitTestApplication application; - - RadioButton radioButton = RadioButton::New(); - - // Default selected - DALI_TEST_CHECK( radioButton.IsSelected() == false ); - - // False - radioButton.SetSelected( false ); - DALI_TEST_CHECK( radioButton.IsSelected() == false ); - - // True - radioButton.SetSelected( true ); - DALI_TEST_CHECK( radioButton.IsSelected() == true ); - - // False - radioButton.SetSelected( false ); - DALI_TEST_CHECK( radioButton.IsSelected() == false ); - - END_TEST; -} - +} \ No newline at end of file