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-Control.cpp;h=f1edb7a067e8f2013cadbdc24a69743f293ca982;hp=e816ff6545a2cff142624b930f0a44b933ee4059;hb=dc3613bb6248908c267a76e378b04962bce85664;hpb=00ef589046a32c53d20de1c61af7cc69524e51dc diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp index e816ff6..f1edb7a 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-Control.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-Control.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 #include @@ -43,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 /////////////////////////////////////////////////////////////////////////////////////////////////// @@ -266,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; } @@ -296,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 ); @@ -343,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; @@ -376,7 +380,7 @@ int UtcDaliControlBackgroundImage(void) DALI_TEST_CHECK( !control.GetBackgroundActor() ); DALI_TEST_EQUALS( control.GetBackgroundColor(), Color::TRANSPARENT, TEST_LOCATION ); - Image image = Image::New("TestImage"); + Image image = ResourceImage::New("TestImage"); control.SetBackground( image ); DALI_TEST_CHECK( control.GetBackgroundActor() ); DALI_TEST_EQUALS( control.GetBackgroundColor(), Color::WHITE, TEST_LOCATION ); @@ -404,7 +408,7 @@ 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_CHECK( control.GetProperty( Control::PROPERTY_BACKGROUND ).Get< Property::Map >().Empty() ); control.SetProperty( Control::PROPERTY_BACKGROUND_COLOR, Color::RED ); DALI_TEST_CHECK( control.GetBackgroundActor() ); @@ -412,9 +416,9 @@ int UtcDaliControlBackgroundProperties(void) 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 ) ); + map[ "image" ] = imageMap; control.SetProperty( Control::PROPERTY_BACKGROUND, map ); DALI_TEST_CHECK( control.GetBackgroundActor() ); DALI_TEST_EQUALS( control.GetBackgroundColor(), Color::RED, TEST_LOCATION ); @@ -430,7 +434,7 @@ 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_CHECK( control.GetProperty( Control::PROPERTY_BACKGROUND ).Get< Property::Map >().Empty() ); END_TEST; } @@ -505,3 +509,29 @@ int UtcDaliControlKeyProperties(void) 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; +}