X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;ds=sidebyside;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-Control.cpp;h=eff8b256705443cf53761252b546c7f5850e0dbc;hb=bf28aab81fbfe59f0d99b1b38658f17d3e37821d;hp=0082fa7230fd219f4a0a239c504fa21a458c577f;hpb=d5e3ed5f5b1c8fdba3ae97ead8729620f54b3836;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp index 0082fa7..eff8b25 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp @@ -44,13 +44,17 @@ void utc_dali_toolkit_control_cleanup(void) namespace { -static bool gObjectCreatedCallBackCalled; +bool gObjectCreatedCallBackCalled; -static void TestCallback(BaseHandle handle) +void TestCallback(BaseHandle handle) { gObjectCreatedCallBackCalled = true; } +void TestVoidCallback() +{ +} + } // namespace /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -267,24 +271,24 @@ int UtcDaliControlSignalConnectDisconnect(void) DummyControl dummy = DummyControlImpl::New(); Actor actor = Actor::New(); - DALI_TEST_EQUALS( actor.SetSizeSignal().GetConnectionCount(), 0u, TEST_LOCATION ); - actor.SetSizeSignal().Connect( &dummy, &DummyControl::CustomSlot1 ); - DALI_TEST_EQUALS( actor.SetSizeSignal().GetConnectionCount(), 1u, TEST_LOCATION ); - DALI_TEST_EQUALS( dummy.mCustomSlot1Called, false, TEST_LOCATION ); - DALI_TEST_EQUALS( dummy.mCustomSlot1Value, Vector3::ZERO, TEST_LOCATION ); - - const Vector3 newSize( 10, 10, 0 ); - actor.SetSize( newSize ); - DALI_TEST_EQUALS( dummy.mCustomSlot1Called, true, TEST_LOCATION ); - DALI_TEST_EQUALS( dummy.mCustomSlot1Value, newSize, TEST_LOCATION ); - - dummy.mCustomSlot1Called = false; - actor.SetSizeSignal().Disconnect( &dummy, &DummyControl::CustomSlot1 ); - DALI_TEST_EQUALS( actor.SetSizeSignal().GetConnectionCount(), 0u, TEST_LOCATION ); - const Vector3 ignoredSize( 20, 20, 0 ); - actor.SetSize( ignoredSize ); - DALI_TEST_EQUALS( dummy.mCustomSlot1Called, false, TEST_LOCATION ); - DALI_TEST_EQUALS( dummy.mCustomSlot1Value, newSize/*not ignoredSize*/, TEST_LOCATION ); + DALI_TEST_EQUALS( actor.OnStageSignal().GetConnectionCount(), 0u, TEST_LOCATION ); + Toolkit::Internal::Control& control = dummy.GetImplementation(); + DummyControlImpl* dummyImpl = dynamic_cast(&control); + DALI_TEST_CHECK( dummyImpl ); + + actor.OnStageSignal().Connect( dummyImpl, &DummyControlImpl::CustomSlot1 ); + DALI_TEST_EQUALS( actor.OnStageSignal().GetConnectionCount(), 1u, TEST_LOCATION ); + DALI_TEST_EQUALS( dummyImpl->mCustomSlot1Called, false, TEST_LOCATION ); + + Stage::GetCurrent().Add( actor ); + DALI_TEST_EQUALS( dummyImpl->mCustomSlot1Called, true, TEST_LOCATION ); + + dummyImpl->mCustomSlot1Called = false; + actor.OnStageSignal().Disconnect( dummyImpl, &DummyControlImpl::CustomSlot1 ); + DALI_TEST_EQUALS( actor.OnStageSignal().GetConnectionCount(), 0u, TEST_LOCATION ); + Stage::GetCurrent().Remove( actor ); + Stage::GetCurrent().Add( actor ); + DALI_TEST_EQUALS( dummyImpl->mCustomSlot1Called, false, TEST_LOCATION ); } END_TEST; } @@ -297,20 +301,21 @@ int UtcDaliControlSignalAutomaticDisconnect(void) { DummyControl dummy = DummyControlImpl::New(); + Toolkit::Internal::Control& control = dummy.GetImplementation(); + DummyControlImpl* dummyImpl = dynamic_cast(&control); + DALI_TEST_CHECK( dummyImpl ); - actor.SetSizeSignal().Connect( &dummy, &DummyControl::CustomSlot1 ); - DALI_TEST_EQUALS( actor.SetSizeSignal().GetConnectionCount(), 1u, TEST_LOCATION ); - DALI_TEST_EQUALS( dummy.mCustomSlot1Called, false, TEST_LOCATION ); - DALI_TEST_EQUALS( dummy.mCustomSlot1Value, Vector3::ZERO, TEST_LOCATION ); + actor.OnStageSignal().Connect( dummyImpl, &DummyControlImpl::CustomSlot1 ); + DALI_TEST_EQUALS( actor.OnStageSignal().GetConnectionCount(), 1u, TEST_LOCATION ); + DALI_TEST_EQUALS( dummyImpl->mCustomSlot1Called, false, TEST_LOCATION ); - const Vector3 newSize( 10, 10, 0 ); - actor.SetSize( newSize ); - DALI_TEST_EQUALS( dummy.mCustomSlot1Called, true, TEST_LOCATION ); - DALI_TEST_EQUALS( dummy.mCustomSlot1Value, newSize, TEST_LOCATION ); + Stage::GetCurrent().Add( actor ); + DALI_TEST_EQUALS( dummyImpl->mCustomSlot1Called, true, TEST_LOCATION ); + Stage::GetCurrent().Remove( actor ); } // dummyControl automatically disconnects - DALI_TEST_EQUALS( actor.SetSizeSignal().GetConnectionCount(), 0u, TEST_LOCATION ); + DALI_TEST_EQUALS( actor.OnStageSignal().GetConnectionCount(), 0u, TEST_LOCATION ); const Vector3 ignoredSize( 20, 20, 0 ); actor.SetSize( ignoredSize ); @@ -344,8 +349,6 @@ int UtcDaliControlTestParameters(void) DALI_TEST_CHECK( test.GetMaximumSize() == maxSize ); test.KeyEventSignal(); - DummyControl test2 = DummyControl::New(); - dynamic_cast< ConnectionTrackerInterface& >( test2 ).GetConnectionCount(); // Provide coverage for pointer destructor Control* testControlPtr = new Control; @@ -377,8 +380,8 @@ int UtcDaliControlBackgroundImage(void) DALI_TEST_CHECK( !control.GetBackgroundActor() ); DALI_TEST_EQUALS( control.GetBackgroundColor(), Color::TRANSPARENT, TEST_LOCATION ); - Image image = Image::New("TestImage"); - control.SetBackground( image ); + Image image = ResourceImage::New("TestImage"); + control.SetBackgroundImage( image ); DALI_TEST_CHECK( control.GetBackgroundActor() ); DALI_TEST_EQUALS( control.GetBackgroundColor(), Color::WHITE, TEST_LOCATION ); @@ -390,7 +393,7 @@ int UtcDaliControlBackgroundImage(void) DALI_TEST_EQUALS( control.GetBackgroundColor(), Color::TRANSPARENT, TEST_LOCATION ); control.SetBackgroundColor( Color::YELLOW ); - control.SetBackground( image ); + control.SetBackgroundImage( image ); DALI_TEST_CHECK( control.GetBackgroundActor() ); DALI_TEST_EQUALS( control.GetBackgroundColor(), Color::YELLOW, TEST_LOCATION ); @@ -404,34 +407,34 @@ int UtcDaliControlBackgroundProperties(void) DALI_TEST_CHECK( !control.GetBackgroundActor() ); DALI_TEST_EQUALS( control.GetBackgroundColor(), Color::TRANSPARENT, TEST_LOCATION ); - DALI_TEST_EQUALS( control.GetProperty( Control::PROPERTY_BACKGROUND_COLOR ).Get< Vector4 >(), Color::TRANSPARENT, TEST_LOCATION ); - DALI_TEST_CHECK( control.GetProperty( Control::PROPERTY_BACKGROUND ).Get< Property::Map >().empty() ); + DALI_TEST_EQUALS( control.GetProperty( Control::Property::BACKGROUND_COLOR ).Get< Vector4 >(), Color::TRANSPARENT, TEST_LOCATION ); + DALI_TEST_CHECK( control.GetProperty( Control::Property::BACKGROUND_IMAGE ).Get< Property::Map >().Empty() ); - control.SetProperty( Control::PROPERTY_BACKGROUND_COLOR, Color::RED ); + control.SetProperty( Control::Property::BACKGROUND_COLOR, Color::RED ); DALI_TEST_CHECK( control.GetBackgroundActor() ); DALI_TEST_EQUALS( control.GetBackgroundColor(), Color::RED, TEST_LOCATION ); - DALI_TEST_EQUALS( control.GetProperty( Control::PROPERTY_BACKGROUND_COLOR ).Get< Vector4 >(), Color::RED, TEST_LOCATION ); + DALI_TEST_EQUALS( control.GetProperty( Control::Property::BACKGROUND_COLOR ).Get< Vector4 >(), Color::RED, TEST_LOCATION ); Property::Map imageMap; - imageMap.push_back( Property::StringValuePair( "filename", "TestImage" ) ); + imageMap[ "filename" ] = "TestImage"; Property::Map map; - map.push_back( Property::StringValuePair( "image", imageMap ) ); - control.SetProperty( Control::PROPERTY_BACKGROUND, map ); + map[ "image" ] = imageMap; + control.SetProperty( Control::Property::BACKGROUND_IMAGE, map ); DALI_TEST_CHECK( control.GetBackgroundActor() ); DALI_TEST_EQUALS( control.GetBackgroundColor(), Color::RED, TEST_LOCATION ); - DALI_TEST_EQUALS( control.GetProperty( Control::PROPERTY_BACKGROUND_COLOR ).Get< Vector4 >(), Color::RED, TEST_LOCATION ); + DALI_TEST_EQUALS( control.GetProperty( Control::Property::BACKGROUND_COLOR ).Get< Vector4 >(), Color::RED, TEST_LOCATION ); - Property::Value propValue = control.GetProperty( Control::PROPERTY_BACKGROUND ); + Property::Value propValue = control.GetProperty( Control::Property::BACKGROUND_IMAGE ); DALI_TEST_CHECK( propValue.HasKey( "image" ) ); DALI_TEST_CHECK( propValue.GetValue( "image" ).HasKey( "filename" ) ); DALI_TEST_CHECK( propValue.GetValue( "image" ).GetValue( "filename" ).Get< std::string>() == "TestImage" ); Property::Map emptyMap; - control.SetProperty( Control::PROPERTY_BACKGROUND, emptyMap ); + control.SetProperty( Control::Property::BACKGROUND_IMAGE, emptyMap ); DALI_TEST_CHECK( !control.GetBackgroundActor() ); DALI_TEST_EQUALS( control.GetBackgroundColor(), Color::TRANSPARENT, TEST_LOCATION ); - DALI_TEST_EQUALS( control.GetProperty( Control::PROPERTY_BACKGROUND_COLOR ).Get< Vector4 >(), Color::TRANSPARENT, TEST_LOCATION ); - DALI_TEST_CHECK( control.GetProperty( Control::PROPERTY_BACKGROUND ).Get< Property::Map >().empty() ); + DALI_TEST_EQUALS( control.GetProperty( Control::Property::BACKGROUND_COLOR ).Get< Vector4 >(), Color::TRANSPARENT, TEST_LOCATION ); + DALI_TEST_CHECK( control.GetProperty( Control::Property::BACKGROUND_IMAGE ).Get< Property::Map >().Empty() ); END_TEST; } @@ -446,15 +449,15 @@ int UtcDaliControlSizePolicyProperties(void) Control::SizePolicy heightPolicy( Control::Fixed ); control.GetSizePolicy( widthPolicy, heightPolicy ); - DALI_TEST_EQUALS( "FIXED", control.GetProperty( Control::PROPERTY_WIDTH_POLICY ).Get< std::string >(), TEST_LOCATION ); - DALI_TEST_EQUALS( "FIXED", control.GetProperty( Control::PROPERTY_HEIGHT_POLICY ).Get< std::string >(), TEST_LOCATION ); + DALI_TEST_EQUALS( "FIXED", control.GetProperty( Control::Property::WIDTH_POLICY ).Get< std::string >(), TEST_LOCATION ); + DALI_TEST_EQUALS( "FIXED", control.GetProperty( Control::Property::HEIGHT_POLICY ).Get< std::string >(), TEST_LOCATION ); control.SetSizePolicy( Control::Flexible, Control::Range ); - DALI_TEST_EQUALS( "FLEXIBLE", control.GetProperty( Control::PROPERTY_WIDTH_POLICY ).Get< std::string >(), TEST_LOCATION ); - DALI_TEST_EQUALS( "RANGE", control.GetProperty( Control::PROPERTY_HEIGHT_POLICY ).Get< std::string >(), TEST_LOCATION ); + DALI_TEST_EQUALS( "FLEXIBLE", control.GetProperty( Control::Property::WIDTH_POLICY ).Get< std::string >(), TEST_LOCATION ); + DALI_TEST_EQUALS( "RANGE", control.GetProperty( Control::Property::HEIGHT_POLICY ).Get< std::string >(), TEST_LOCATION ); - control.SetProperty( Control::PROPERTY_WIDTH_POLICY, "MAXIMUM" ); - control.SetProperty( Control::PROPERTY_HEIGHT_POLICY, "MINIMUM" ); + control.SetProperty( Control::Property::WIDTH_POLICY, "MAXIMUM" ); + control.SetProperty( Control::Property::HEIGHT_POLICY, "MINIMUM" ); control.GetSizePolicy( widthPolicy, heightPolicy ); DALI_TEST_EQUALS( Control::Maximum, widthPolicy, TEST_LOCATION ); DALI_TEST_EQUALS( Control::Minimum, heightPolicy, TEST_LOCATION ); @@ -468,18 +471,18 @@ int UtcDaliControlSizeProperties(void) Control control = Control::New(); - DALI_TEST_EQUALS( control.GetMinimumSize(), control.GetProperty( Control::PROPERTY_MINIMUM_SIZE ).Get< Vector3 >(), TEST_LOCATION ); - DALI_TEST_EQUALS( control.GetMaximumSize(), control.GetProperty( Control::PROPERTY_MAXIMUM_SIZE ).Get< Vector3 >(), TEST_LOCATION ); + DALI_TEST_EQUALS( control.GetMinimumSize(), control.GetProperty( Control::Property::MINIMUM_SIZE ).Get< Vector3 >(), TEST_LOCATION ); + DALI_TEST_EQUALS( control.GetMaximumSize(), control.GetProperty( Control::Property::MAXIMUM_SIZE ).Get< Vector3 >(), TEST_LOCATION ); control.SetMinimumSize( Vector3( 100.0f, 200.0f, 300.0f ) ); - DALI_TEST_EQUALS( Vector3( 100.0f, 200.0f, 300.0f ), control.GetProperty( Control::PROPERTY_MINIMUM_SIZE ).Get< Vector3 >(), TEST_LOCATION ); + DALI_TEST_EQUALS( Vector3( 100.0f, 200.0f, 300.0f ), control.GetProperty( Control::Property::MINIMUM_SIZE ).Get< Vector3 >(), TEST_LOCATION ); control.SetMaximumSize( Vector3( 200.0f, 250.0f, 800.0f ) ); - DALI_TEST_EQUALS( Vector3( 200.0f, 250.0f, 800.0f ), control.GetProperty( Control::PROPERTY_MAXIMUM_SIZE ).Get< Vector3 >(), TEST_LOCATION ); + DALI_TEST_EQUALS( Vector3( 200.0f, 250.0f, 800.0f ), control.GetProperty( Control::Property::MAXIMUM_SIZE ).Get< Vector3 >(), TEST_LOCATION ); - control.SetProperty( Control::PROPERTY_MINIMUM_SIZE, Vector3( 1.0f, 2.0f, 3.0f ) ); - control.SetProperty( Control::PROPERTY_MAXIMUM_SIZE, Vector3( 10.0f, 20.0f, 30.0f ) ); + control.SetProperty( Control::Property::MINIMUM_SIZE, Vector3( 1.0f, 2.0f, 3.0f ) ); + control.SetProperty( Control::Property::MAXIMUM_SIZE, Vector3( 10.0f, 20.0f, 30.0f ) ); DALI_TEST_EQUALS( control.GetMinimumSize(), Vector3( 1.0f, 2.0f, 3.0f ), TEST_LOCATION ); DALI_TEST_EQUALS( control.GetMaximumSize(), Vector3( 10.0f, 20.0f, 30.0f ), TEST_LOCATION ); @@ -493,16 +496,42 @@ int UtcDaliControlKeyProperties(void) Control control = Control::New(); Stage::GetCurrent().Add( control ); - DALI_TEST_EQUALS( control.HasKeyInputFocus(), control.GetProperty( Control::PROPERTY_KEY_INPUT_FOCUS ).Get< bool >(), TEST_LOCATION ); + DALI_TEST_EQUALS( control.HasKeyInputFocus(), control.GetProperty( Control::Property::KEY_INPUT_FOCUS ).Get< bool >(), TEST_LOCATION ); control.SetKeyInputFocus(); - DALI_TEST_EQUALS( true, control.GetProperty( Control::PROPERTY_KEY_INPUT_FOCUS ).Get< bool >(), TEST_LOCATION ); + DALI_TEST_EQUALS( true, control.GetProperty( Control::Property::KEY_INPUT_FOCUS ).Get< bool >(), TEST_LOCATION ); control.ClearKeyInputFocus(); - DALI_TEST_EQUALS( false, control.GetProperty( Control::PROPERTY_KEY_INPUT_FOCUS ).Get< bool >(), TEST_LOCATION ); + DALI_TEST_EQUALS( false, control.GetProperty( Control::Property::KEY_INPUT_FOCUS ).Get< bool >(), TEST_LOCATION ); - control.SetProperty( Control::PROPERTY_KEY_INPUT_FOCUS, true ); + control.SetProperty( Control::Property::KEY_INPUT_FOCUS, true ); DALI_TEST_EQUALS( true, control.HasKeyInputFocus(), TEST_LOCATION ); END_TEST; } + +int UtcDaliControlGestureSignals(void) +{ + ToolkitTestApplication application; + ConnectionTracker connectionTracker; + Control control = Control::New(); + + // Each gesture detector gets created when connecting to the gesture signals + DALI_TEST_CHECK( !control.GetTapGestureDetector() ); + control.ConnectSignal( &connectionTracker, "tapped", &TestVoidCallback ); + DALI_TEST_CHECK( control.GetTapGestureDetector() ); + + DALI_TEST_CHECK( !control.GetPanGestureDetector() ); + control.ConnectSignal( &connectionTracker, "panned", &TestVoidCallback ); + DALI_TEST_CHECK( control.GetPanGestureDetector() ); + + DALI_TEST_CHECK( !control.GetPinchGestureDetector() ); + control.ConnectSignal( &connectionTracker, "pinched", &TestVoidCallback ); + DALI_TEST_CHECK( control.GetPinchGestureDetector() ); + + DALI_TEST_CHECK( !control.GetLongPressGestureDetector() ); + control.ConnectSignal( &connectionTracker, "long-pressed", &TestVoidCallback ); + DALI_TEST_CHECK( control.GetLongPressGestureDetector() ); + + END_TEST; +}