/*
- * Copyright (c) 2014 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2020 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.
{
functorCalled = false;
- receivedKeyEvent.keyModifier = 0;
- receivedKeyEvent.keyPressedName.clear();
- receivedKeyEvent.keyPressed.clear();
+ receivedKeyEvent.Reset();
}
bool functorCalled;
{
functorCalled = false;
- receivedKeyEvent.keyModifier = 0;
- receivedKeyEvent.keyPressedName.clear();
- receivedKeyEvent.keyPressed.clear();
+ receivedKeyEvent.Reset();
}
bool functorCalled;
};
// Stores data that is populated in the touched signal callback and will be read by the TET cases
-struct TouchedSignalData
+struct TouchSignalData
{
- TouchedSignalData()
+ TouchSignalData()
: functorCalled(false)
{}
{
functorCalled = false;
- receivedTouchEvent.points.clear();
- receivedTouchEvent.time = 0;
-
- receivedTouchData.Reset();
+ receivedTouchEvent.Reset();
}
bool functorCalled;
TouchEvent receivedTouchEvent;
- TouchData receivedTouchData;
};
// Functor that sets the data when touched signal is received
-struct TouchedFunctor
-{
- TouchedFunctor( TouchedSignalData& data ) : signalData( data ) { }
-
- void operator()( const TouchEvent& touch )
- {
- signalData.functorCalled = true;
- signalData.receivedTouchEvent = touch;
- }
-
- TouchedSignalData& signalData;
-};
-
-
-// Functor that sets the data when touched signal is received
struct TouchFunctor
{
- TouchFunctor( TouchedSignalData& data ) : signalData( data ) { }
+ TouchFunctor( TouchSignalData& data ) : signalData( data ) { }
- void operator()( const TouchData& touch )
+ void operator()( const TouchEvent& touch )
{
signalData.functorCalled = true;
- signalData.receivedTouchData = touch;
+ TouchEvent handle(touch);
+ signalData.receivedTouchEvent = handle;
}
void operator()()
signalData.functorCalled = true;
}
- TouchedSignalData& signalData;
+ TouchSignalData& signalData;
};
// Stores data that is populated in the wheel-event callback and will be read by the TET cases
Stage stage = Stage::GetCurrent();
Actor actor = Actor::New();
- DALI_TEST_CHECK( !actor.OnStage() );
+ DALI_TEST_CHECK( !actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) );
stage.Add( actor );
- DALI_TEST_CHECK( actor.OnStage() );
+ DALI_TEST_CHECK( actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) );
END_TEST;
}
Stage stage = Stage::GetCurrent();
Actor actor = Actor::New();
- DALI_TEST_CHECK( !actor.OnStage() );
+ DALI_TEST_CHECK( !actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) );
stage.Add( actor );
- DALI_TEST_CHECK( actor.OnStage() );
+ DALI_TEST_CHECK( actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) );
stage.Remove(actor);
- DALI_TEST_CHECK( !actor.OnStage() );
+ DALI_TEST_CHECK( !actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) );
END_TEST;
}
Stage stage = Stage::GetCurrent();
Actor actor = Actor::New();
- DALI_TEST_CHECK( !actor.OnStage() );
+ DALI_TEST_CHECK( !actor.GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE ) );
bool asserted = false;
try
TestApplication application; // Initializes core DPI to default values
// Test that setting core DPI explicitly also sets up the Stage's DPI.
- application.GetCore().SetDpi( 200, 180 );
+ Dali::Integration::Scene scene = application.GetScene();
+ scene.SetDpi( Vector2(200.0f, 180.0f) );
Stage stage = Stage::GetCurrent();
Vector2 dpi = stage.GetDpi();
int UtcDaliStageGetDpiP3(void)
{
- TestApplication application( 480, 800, 72.0f, 120.0f ); // Initializes core DPI with specific values
+ TestApplication application( 480, 800, 72, 120 ); // Initializes core DPI with specific values
Stage stage = Stage::GetCurrent();
KeyEventGeneratedReceivedFunctor functor2( data2 );
GetImplementation( stage ).ConnectSignal( &application, "keyEventGenerated", functor2 );
- Integration::KeyEvent event( "a", "a", 0, 0, 0, Integration::KeyEvent::Up, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE );
+ Integration::KeyEvent event( "a", "", "a", 0, 0, 0, Integration::KeyEvent::UP, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE );
application.ProcessEvent( event );
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_CHECK( event.keyModifier == data.receivedKeyEvent.keyModifier );
- DALI_TEST_CHECK( event.keyName == data.receivedKeyEvent.keyPressedName );
- DALI_TEST_CHECK( event.keyString == data.receivedKeyEvent.keyPressed );
- DALI_TEST_CHECK( event.state == static_cast<Integration::KeyEvent::State>( data.receivedKeyEvent.state ) );
+ DALI_TEST_CHECK( event.keyModifier == data.receivedKeyEvent.GetKeyModifier() );
+ DALI_TEST_CHECK( event.keyName == data.receivedKeyEvent.GetKeyName() );
+ DALI_TEST_CHECK( event.keyString == data.receivedKeyEvent.GetKeyString() );
+ DALI_TEST_CHECK( event.state == static_cast<Integration::KeyEvent::State>( data.receivedKeyEvent.GetState() ) );
data.Reset();
- Integration::KeyEvent event2( "i", "i", 0, 0, 0, Integration::KeyEvent::Up, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE );
+ Integration::KeyEvent event2( "i", "", "i", 0, 0, 0, Integration::KeyEvent::UP, "i", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE );
application.ProcessEvent( event2 );
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_CHECK( event2.keyModifier == data.receivedKeyEvent.keyModifier );
- DALI_TEST_CHECK( event2.keyName == data.receivedKeyEvent.keyPressedName );
- DALI_TEST_CHECK( event2.keyString == data.receivedKeyEvent.keyPressed );
- DALI_TEST_CHECK( event2.state == static_cast<Integration::KeyEvent::State>( data.receivedKeyEvent.state ) );
+ DALI_TEST_CHECK( event2.keyModifier == data.receivedKeyEvent.GetKeyModifier() );
+ DALI_TEST_CHECK( event2.keyName == data.receivedKeyEvent.GetKeyName() );
+ DALI_TEST_CHECK( event2.keyString == data.receivedKeyEvent.GetKeyString() );
+ DALI_TEST_CHECK( event2.state == static_cast<Integration::KeyEvent::State>( data.receivedKeyEvent.GetState() ) );
data.Reset();
- Integration::KeyEvent event3( "a", "a", 0, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE );
+ Integration::KeyEvent event3( "a", "", "a", 0, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE );
application.ProcessEvent( event3 );
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_CHECK( event3.keyModifier == data.receivedKeyEvent.keyModifier );
- DALI_TEST_CHECK( event3.keyName == data.receivedKeyEvent.keyPressedName );
- DALI_TEST_CHECK( event3.keyString == data.receivedKeyEvent.keyPressed );
- DALI_TEST_CHECK( event3.state == static_cast<Integration::KeyEvent::State>( data.receivedKeyEvent.state ) );
+ DALI_TEST_CHECK( event3.keyModifier == data.receivedKeyEvent.GetKeyModifier() );
+ DALI_TEST_CHECK( event3.keyName == data.receivedKeyEvent.GetKeyName() );
+ DALI_TEST_CHECK( event3.keyString == data.receivedKeyEvent.GetKeyString() );
+ DALI_TEST_CHECK( event3.state == static_cast<Integration::KeyEvent::State>( data.receivedKeyEvent.GetState() ) );
data.Reset();
- Integration::KeyEvent event4( "a", "a", 0, 0, 0, Integration::KeyEvent::Up, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE );
+ Integration::KeyEvent event4( "a", "", "a", 0, 0, 0, Integration::KeyEvent::UP, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE );
application.ProcessEvent( event4 );
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_CHECK( event4.keyModifier == data.receivedKeyEvent.keyModifier );
- DALI_TEST_CHECK( event4.keyName == data.receivedKeyEvent.keyPressedName );
- DALI_TEST_CHECK( event4.keyString == data.receivedKeyEvent.keyPressed );
- DALI_TEST_CHECK( event4.state == static_cast<Integration::KeyEvent::State>( data.receivedKeyEvent.state ) );
+ DALI_TEST_CHECK( event4.keyModifier == data.receivedKeyEvent.GetKeyModifier() );
+ DALI_TEST_CHECK( event4.keyName == data.receivedKeyEvent.GetKeyName() );
+ DALI_TEST_CHECK( event4.keyString == data.receivedKeyEvent.GetKeyString() );
+ DALI_TEST_CHECK( event4.state == static_cast<Integration::KeyEvent::State>( data.receivedKeyEvent.GetState() ) );
END_TEST;
}
KeyEventReceivedFunctor functor( data );
stage.KeyEventSignal().Connect( &application, functor );
- Integration::KeyEvent event( "i", "i", 0, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE );
+ Integration::KeyEvent event( "i", "", "i", 0, 0, 0, Integration::KeyEvent::DOWN, "i", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE );
application.ProcessEvent( event );
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_CHECK( event.keyModifier == data.receivedKeyEvent.keyModifier );
- DALI_TEST_CHECK( event.keyName == data.receivedKeyEvent.keyPressedName );
- DALI_TEST_CHECK( event.keyString == data.receivedKeyEvent.keyPressed );
- DALI_TEST_CHECK( event.state == static_cast<Integration::KeyEvent::State>( data.receivedKeyEvent.state ) );
+ DALI_TEST_CHECK( event.keyModifier == data.receivedKeyEvent.GetKeyModifier() );
+ DALI_TEST_CHECK( event.keyName == data.receivedKeyEvent.GetKeyName() );
+ DALI_TEST_CHECK( event.keyString == data.receivedKeyEvent.GetKeyString() );
+ DALI_TEST_CHECK( event.state == static_cast<Integration::KeyEvent::State>( data.receivedKeyEvent.GetState() ) );
data.Reset();
- Integration::KeyEvent event2( "i", "i", 0, 0, 0, Integration::KeyEvent::Up, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE );
+ Integration::KeyEvent event2( "i", "", "i", 0, 0, 0, Integration::KeyEvent::UP, "i", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE );
application.ProcessEvent( event2 );
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_CHECK( event2.keyModifier == data.receivedKeyEvent.keyModifier );
- DALI_TEST_CHECK( event2.keyName == data.receivedKeyEvent.keyPressedName );
- DALI_TEST_CHECK( event2.keyString == data.receivedKeyEvent.keyPressed );
- DALI_TEST_CHECK( event2.state == static_cast<Integration::KeyEvent::State>( data.receivedKeyEvent.state ) );
+ DALI_TEST_CHECK( event2.keyModifier == data.receivedKeyEvent.GetKeyModifier() );
+ DALI_TEST_CHECK( event2.keyName == data.receivedKeyEvent.GetKeyName() );
+ DALI_TEST_CHECK( event2.keyString == data.receivedKeyEvent.GetKeyString() );
+ DALI_TEST_CHECK( event2.state == static_cast<Integration::KeyEvent::State>( data.receivedKeyEvent.GetState() ) );
data.Reset();
- Integration::KeyEvent event3( "a", "a", 0, 0, 0, Integration::KeyEvent::Down, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE );
+ Integration::KeyEvent event3( "a", "", "a", 0, 0, 0, Integration::KeyEvent::DOWN, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE );
application.ProcessEvent( event3 );
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_CHECK( event3.keyModifier == data.receivedKeyEvent.keyModifier );
- DALI_TEST_CHECK( event3.keyName == data.receivedKeyEvent.keyPressedName );
- DALI_TEST_CHECK( event3.keyString == data.receivedKeyEvent.keyPressed );
- DALI_TEST_CHECK( event3.state == static_cast<Integration::KeyEvent::State>( data.receivedKeyEvent.state ) );
+ DALI_TEST_CHECK( event3.keyModifier == data.receivedKeyEvent.GetKeyModifier() );
+ DALI_TEST_CHECK( event3.keyName == data.receivedKeyEvent.GetKeyName() );
+ DALI_TEST_CHECK( event3.keyString == data.receivedKeyEvent.GetKeyString() );
+ DALI_TEST_CHECK( event3.state == static_cast<Integration::KeyEvent::State>( data.receivedKeyEvent.GetState() ) );
data.Reset();
- Integration::KeyEvent event4( "a", "a", 0, 0, 0, Integration::KeyEvent::Up, DEFAULT_DEVICE_NAME, DevelKeyEvent::DeviceClass::NONE );
+ Integration::KeyEvent event4( "a", "", "a", 0, 0, 0, Integration::KeyEvent::UP, "a", DEFAULT_DEVICE_NAME, Device::Class::NONE, Device::Subclass::NONE );
application.ProcessEvent( event4 );
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_CHECK( event4.keyModifier == data.receivedKeyEvent.keyModifier );
- DALI_TEST_CHECK( event4.keyName == data.receivedKeyEvent.keyPressedName );
- DALI_TEST_CHECK( event4.keyString == data.receivedKeyEvent.keyPressed );
- DALI_TEST_CHECK( event4.state == static_cast<Integration::KeyEvent::State>( data.receivedKeyEvent.state ) );
+ DALI_TEST_CHECK( event4.keyModifier == data.receivedKeyEvent.GetKeyModifier() );
+ DALI_TEST_CHECK( event4.keyName == data.receivedKeyEvent.GetKeyName() );
+ DALI_TEST_CHECK( event4.keyString == data.receivedKeyEvent.GetKeyString() );
+ DALI_TEST_CHECK( event4.state == static_cast<Integration::KeyEvent::State>( data.receivedKeyEvent.GetState() ) );
END_TEST;
}
TestApplication application;
Stage stage = Stage::GetCurrent();
- TouchedSignalData data;
- TouchedFunctor functor( data );
- stage.TouchedSignal().Connect( &application, functor );
+ TouchSignalData data;
+ TouchFunctor functor( data );
+ stage.TouchSignal().Connect( &application, functor );
// Render and notify.
application.SendNotification();
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
- DALI_TEST_CHECK( !data.receivedTouchEvent.points[0].hitActor );
+ DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) );
data.Reset();
GenerateTouch( application, PointState::UP, Vector2( 10.0f, 10.0f ) );
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
- DALI_TEST_CHECK( !data.receivedTouchEvent.points[0].hitActor );
+ DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) );
+
data.Reset();
}
// Add an actor to the scene.
Actor actor = Actor::New();
- actor.SetSize( 100.0f, 100.0f );
- actor.SetAnchorPoint( AnchorPoint::TOP_LEFT );
- actor.SetParentOrigin( ParentOrigin::TOP_LEFT );
- actor.TouchedSignal().Connect( &DummyTouchCallback );
+ actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) );
+ actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+ actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
+ actor.TouchSignal().Connect( &DummyTouchCallback );
stage.Add( actor );
// Render and notify.
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
- DALI_TEST_CHECK( data.receivedTouchEvent.points[0].hitActor == actor );
+ DALI_TEST_CHECK( data.receivedTouchEvent.GetHitActor(0) );
data.Reset();
GenerateTouch( application, PointState::MOTION, Vector2( 150.0f, 10.0f ) ); // Some motion
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
- DALI_TEST_CHECK( !data.receivedTouchEvent.points[0].hitActor );
+ DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) );
data.Reset();
}
touchEvent.points.push_back( point );
application.ProcessEvent( touchEvent );
DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
- DALI_TEST_EQUALS( data.receivedTouchEvent.GetPointCount(), 0u, TEST_LOCATION );
+ DALI_TEST_EQUALS( (bool)data.receivedTouchEvent, false, TEST_LOCATION );
data.Reset();
// Primary point is up
touchEvent.points[1].SetState( PointState::STATIONARY );
application.ProcessEvent( touchEvent );
DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
- DALI_TEST_EQUALS( data.receivedTouchEvent.GetPointCount(), 0u, TEST_LOCATION );
+ DALI_TEST_EQUALS( (bool)data.receivedTouchEvent, false, TEST_LOCATION );
data.Reset();
// Remove 1st point now, 2nd point is now in motion
touchEvent.points[0].SetScreenPosition( Vector2( 150.0f, 50.0f ) );
application.ProcessEvent( touchEvent );
DALI_TEST_EQUALS( false, data.functorCalled, TEST_LOCATION );
- DALI_TEST_EQUALS( data.receivedTouchEvent.GetPointCount(), 0u, TEST_LOCATION );
+ DALI_TEST_EQUALS( (bool)data.receivedTouchEvent, false, TEST_LOCATION );
data.Reset();
// Final point Up
TestApplication application;
Stage stage = Stage::GetCurrent();
- TouchedSignalData data;
- TouchedFunctor functor( data );
- stage.TouchedSignal().Connect( &application, functor );
+ TouchSignalData data;
+ TouchFunctor functor( data );
+ stage.TouchSignal().Connect( &application, functor );
// Render and notify.
application.SendNotification();
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
- DALI_TEST_CHECK( !data.receivedTouchEvent.points[0].hitActor );
+ DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) );
data.Reset();
// Confirm there is no signal when the touchpoint is only moved.
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
- DALI_TEST_CHECK( !data.receivedTouchEvent.points[0].hitActor );
+ DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) );
data.Reset();
}
// Add an actor to the scene.
Actor actor = Actor::New();
- actor.SetSize( 100.0f, 100.0f );
- actor.SetAnchorPoint( AnchorPoint::TOP_LEFT );
- actor.SetParentOrigin( ParentOrigin::TOP_LEFT );
- actor.TouchedSignal().Connect( &DummyTouchCallback );
+ actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) );
+ actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+ actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
+ actor.TouchSignal().Connect( &DummyTouchCallback );
stage.Add( actor );
// Render and notify.
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
- DALI_TEST_CHECK( !data.receivedTouchEvent.points[0].hitActor );
- DALI_TEST_CHECK( data.receivedTouchEvent.points[0].state == TouchPoint::Interrupted );
+ DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) );
+ DALI_TEST_CHECK( data.receivedTouchEvent.GetState(0) == PointState::INTERRUPTED );
data.Reset();
GenerateTouch( application, PointState::DOWN, Vector2( 10.0f, 10.0f ) );
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
- DALI_TEST_CHECK( data.receivedTouchEvent.points[0].hitActor == actor );
- DALI_TEST_CHECK( data.receivedTouchEvent.points[0].state == TouchPoint::Down );
+ DALI_TEST_CHECK( data.receivedTouchEvent.GetHitActor(0) == actor );
+ DALI_TEST_CHECK( data.receivedTouchEvent.GetState(0) == PointState::DOWN );
data.Reset();
GenerateTouch( application, PointState::INTERRUPTED, Vector2( 10.0f, 10.0f ) );
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
- DALI_TEST_CHECK( !data.receivedTouchEvent.points[0].hitActor );
- DALI_TEST_CHECK( data.receivedTouchEvent.points[0].state == TouchPoint::Interrupted );
+ DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) );
+ DALI_TEST_CHECK( data.receivedTouchEvent.GetState(0) == PointState::INTERRUPTED );
DALI_TEST_EQUALS( data.receivedTouchEvent.GetPointCount(), 1u, TEST_LOCATION );
// Check that getting info about a non-existent point causes an assert.
- bool asserted = false;
- try
- {
- data.receivedTouchEvent.GetPoint( 1 );
- }
- catch( Dali::DaliException& e )
- {
- DALI_TEST_PRINT_ASSERT( e );
- DALI_TEST_ASSERT( e, "point < points.size() && \"No point at index\"", TEST_LOCATION );
- asserted = true;
- }
- DALI_TEST_CHECK( asserted );
+ DALI_TEST_EQUALS( data.receivedTouchEvent.GetState( 1 ), PointState::FINISHED, TEST_LOCATION );
data.Reset();
}
TestApplication application;
Stage stage = Stage::GetCurrent();
- TouchedSignalData data;
+ TouchSignalData data;
TouchFunctor functor( data );
stage.TouchSignal().Connect( &application, functor );
GenerateTouch( application, PointState::DOWN, Vector2( 10.0f, 10.0f ) );
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u );
- DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0) );
+ DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
+ DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) );
data.Reset();
GenerateTouch( application, PointState::UP, Vector2( 10.0f, 10.0f ) );
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u );
- DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0) );
+ DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
+ DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) );
data.Reset();
}
// Add an actor to the scene.
Actor actor = Actor::New();
- actor.SetSize( 100.0f, 100.0f );
- actor.SetAnchorPoint( AnchorPoint::TOP_LEFT );
- actor.SetParentOrigin( ParentOrigin::TOP_LEFT );
- actor.TouchedSignal().Connect( &DummyTouchCallback );
+ actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) );
+ actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+ actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
+ actor.TouchSignal().Connect( &DummyTouchCallback );
stage.Add( actor );
// Render and notify.
GenerateTouch( application, PointState::DOWN, Vector2( 10.0f, 10.0f ) );
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u );
- DALI_TEST_CHECK( data.receivedTouchData.GetHitActor(0) == actor );
+ DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
+ DALI_TEST_CHECK( data.receivedTouchEvent.GetHitActor(0) == actor );
data.Reset();
GenerateTouch( application, PointState::MOTION, Vector2( 150.0f, 10.0f ) ); // Some motion
GenerateTouch( application, PointState::UP, Vector2( 150.0f, 10.0f ) ); // Some motion
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u );
- DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0) );
+ DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
+ DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) );
data.Reset();
}
touchEvent.points.push_back( point );
application.ProcessEvent( touchEvent );
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_EQUALS( data.receivedTouchData.GetPointCount(), 1u, TEST_LOCATION );
+ DALI_TEST_EQUALS( data.receivedTouchEvent.GetPointCount(), 1u, TEST_LOCATION );
data.Reset();
// 2nd point
touchEvent.points[0].SetState( PointState::UP );
application.ProcessEvent( touchEvent );
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_EQUALS( data.receivedTouchData.GetPointCount(), 1u, TEST_LOCATION );
+ DALI_TEST_EQUALS( data.receivedTouchEvent.GetPointCount(), 1u, TEST_LOCATION );
data.Reset();
}
END_TEST;
TestApplication application;
Stage stage = Stage::GetCurrent();
- TouchedSignalData data;
+ TouchSignalData data;
TouchFunctor functor( data );
stage.TouchSignal().Connect( &application, functor );
- TouchedSignalData data2;
+ TouchSignalData data2;
TouchFunctor functor2( data2 );
GetImplementation( stage ).ConnectSignal( &application, "touch", functor2 );
GenerateTouch( application, PointState::DOWN, Vector2( 10.0f, 10.0f ) );
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u );
- DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0));
+ DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
+ DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0));
DALI_TEST_EQUALS( true, data2.functorCalled, TEST_LOCATION );
GenerateTouch( application, PointState::UP, Vector2( 1200.0f, 10.0f ) );
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u );
- DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0));
+ DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
+ DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0));
data.Reset();
}
// Add an actor to the scene.
Actor actor = Actor::New();
- actor.SetSize( 100.0f, 100.0f );
- actor.SetAnchorPoint( AnchorPoint::TOP_LEFT );
- actor.SetParentOrigin( ParentOrigin::TOP_LEFT );
- actor.TouchedSignal().Connect( &DummyTouchCallback );
+ actor.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) );
+ actor.SetProperty( Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT );
+ actor.SetProperty( Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT );
+ actor.TouchSignal().Connect( &DummyTouchCallback );
stage.Add( actor );
// Render and notify.
GenerateTouch( application, PointState::INTERRUPTED, Vector2( 10.0f, 10.0f ) );
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u );
- DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0) );
- DALI_TEST_CHECK( data.receivedTouchData.GetState(0) == PointState::INTERRUPTED );
+ DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
+ DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) );
+ DALI_TEST_CHECK( data.receivedTouchEvent.GetState(0) == PointState::INTERRUPTED );
data.Reset();
GenerateTouch( application, PointState::DOWN, Vector2( 10.0f, 10.0f ) );
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u );
- DALI_TEST_CHECK( data.receivedTouchData.GetHitActor(0) == actor );
- DALI_TEST_CHECK( data.receivedTouchData.GetState(0) == PointState::DOWN );
+ DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
+ DALI_TEST_CHECK( data.receivedTouchEvent.GetHitActor(0) == actor );
+ DALI_TEST_CHECK( data.receivedTouchEvent.GetState(0) == PointState::DOWN );
data.Reset();
GenerateTouch( application, PointState::INTERRUPTED, Vector2( 10.0f, 10.0f ) );
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_CHECK( data.receivedTouchData.GetPointCount() != 0u );
- DALI_TEST_CHECK( !data.receivedTouchData.GetHitActor(0) );
- DALI_TEST_CHECK( data.receivedTouchData.GetState(0) == PointState::INTERRUPTED );
+ DALI_TEST_CHECK( data.receivedTouchEvent.GetPointCount() != 0u );
+ DALI_TEST_CHECK( !data.receivedTouchEvent.GetHitActor(0) );
+ DALI_TEST_CHECK( data.receivedTouchEvent.GetState(0) == PointState::INTERRUPTED );
- DALI_TEST_EQUALS( data.receivedTouchData.GetPointCount(), 1u, TEST_LOCATION );
+ DALI_TEST_EQUALS( data.receivedTouchEvent.GetPointCount(), 1u, TEST_LOCATION );
// Check that getting info about a non-existent point returns an empty handle
- Actor actor = data.receivedTouchData.GetHitActor( 1 );
+ Actor actor = data.receivedTouchEvent.GetHitActor( 1 );
DALI_TEST_CHECK( !actor );
data.Reset();
application.ProcessEvent( event );
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_CHECK( static_cast< WheelEvent::Type >(event.type) == data.receivedWheelEvent.type );
- DALI_TEST_CHECK( event.direction == data.receivedWheelEvent.direction );
- DALI_TEST_CHECK( event.modifiers == data.receivedWheelEvent.modifiers );
- DALI_TEST_CHECK( event.point == data.receivedWheelEvent.point );
- DALI_TEST_CHECK( event.z == data.receivedWheelEvent.z );
- DALI_TEST_CHECK( event.timeStamp == data.receivedWheelEvent.timeStamp );
+ DALI_TEST_CHECK( static_cast< WheelEvent::Type >(event.type) == data.receivedWheelEvent.GetType() );
+ DALI_TEST_CHECK( event.direction == data.receivedWheelEvent.GetDirection() );
+ DALI_TEST_CHECK( event.modifiers == data.receivedWheelEvent.GetModifiers() );
+ DALI_TEST_CHECK( event.point == data.receivedWheelEvent.GetPoint() );
+ DALI_TEST_CHECK( event.delta == data.receivedWheelEvent.GetDelta() );
+ DALI_TEST_CHECK( event.timeStamp == data.receivedWheelEvent.GetTime() );
data.Reset();
application.ProcessEvent( event2 );
DALI_TEST_EQUALS( true, data.functorCalled, TEST_LOCATION );
- DALI_TEST_CHECK( static_cast< WheelEvent::Type >(event2.type) == data.receivedWheelEvent.type );
- DALI_TEST_CHECK( event2.direction == data.receivedWheelEvent.direction );
- DALI_TEST_CHECK( event2.modifiers == data.receivedWheelEvent.modifiers );
- DALI_TEST_CHECK( event2.point == data.receivedWheelEvent.point );
- DALI_TEST_CHECK( event2.z == data.receivedWheelEvent.z );
- DALI_TEST_CHECK( event2.timeStamp == data.receivedWheelEvent.timeStamp );
+ DALI_TEST_CHECK( static_cast< WheelEvent::Type >(event2.type) == data.receivedWheelEvent.GetType() );
+ DALI_TEST_CHECK( event2.direction == data.receivedWheelEvent.GetDirection() );
+ DALI_TEST_CHECK( event2.modifiers == data.receivedWheelEvent.GetModifiers() );
+ DALI_TEST_CHECK( event2.point == data.receivedWheelEvent.GetPoint() );
+ DALI_TEST_CHECK( event2.delta == data.receivedWheelEvent.GetDelta() );
+ DALI_TEST_CHECK( event2.timeStamp == data.receivedWheelEvent.GetTime() );
END_TEST;
}
int UtcDaliStageContextLostSignalP(void)
{
- TestApplication app;
+ TestApplication application;
Stage stage = Stage::GetCurrent();
bool contextLost = false;
ContextStatusFunctor contextLostFunctor( contextLost );
- stage.ContextLostSignal().Connect( &app, contextLostFunctor );
+ stage.ContextLostSignal().Connect( &application, contextLostFunctor );
- Integration::ContextNotifierInterface* notifier = app.GetCore().GetContextNotifier();
+ Integration::ContextNotifierInterface* notifier = application.GetCore().GetContextNotifier();
notifier->NotifyContextLost();
DALI_TEST_EQUALS( contextLost, true, TEST_LOCATION );
int UtcDaliStageContextLostSignalN(void)
{
- TestApplication app;
+ TestApplication application;
Stage stage;
// Check that connecting to the signal with a bad stage instance causes an assert.
ContextStatusFunctor contextLostFunctor( contextLost );
try
{
- stage.ContextLostSignal().Connect( &app, contextLostFunctor );
+ stage.ContextLostSignal().Connect( &application, contextLostFunctor );
}
catch( Dali::DaliException& e )
{
int UtcDaliStageContextRegainedSignalP(void)
{
- TestApplication app;
+ TestApplication application;
Stage stage = Stage::GetCurrent();
bool contextRegained = false;
ContextStatusFunctor contextRegainedFunctor( contextRegained );
- stage.ContextRegainedSignal().Connect( &app, contextRegainedFunctor );
+ stage.ContextRegainedSignal().Connect( &application, contextRegainedFunctor );
- Integration::ContextNotifierInterface* notifier = app.GetCore().GetContextNotifier();
+ Integration::ContextNotifierInterface* notifier = application.GetCore().GetContextNotifier();
notifier->NotifyContextLost();
notifier->NotifyContextRegained();
DALI_TEST_EQUALS( contextRegained, true, TEST_LOCATION );
int UtcDaliStageContextRegainedSignalN(void)
{
- TestApplication app;
+ TestApplication application;
Stage stage;
// Check that connecting to the signal with a bad stage instance causes an assert.
ContextStatusFunctor contextRegainedFunctor( contextRegained );
try
{
- stage.ContextRegainedSignal().Connect( &app, contextRegainedFunctor );
+ stage.ContextRegainedSignal().Connect( &application, contextRegainedFunctor );
}
catch( Dali::DaliException& e )
{
int UtcDaliStageSceneCreatedSignalP(void)
{
- TestApplication app;
+ TestApplication application;
Stage stage = Stage::GetCurrent();
bool signalCalled = false;
SceneCreatedStatusFunctor sceneCreatedFunctor( signalCalled );
- stage.SceneCreatedSignal().Connect( &app, sceneCreatedFunctor );
+ stage.SceneCreatedSignal().Connect( &application, sceneCreatedFunctor );
- Integration::Core& core = app.GetCore();
+ Integration::Core& core = application.GetCore();
core.SceneCreated();
DALI_TEST_EQUALS( signalCalled, true, TEST_LOCATION );
int UtcDaliStageSceneCreatedSignalN(void)
{
- TestApplication app;
+ TestApplication application;
Stage stage;
// Check that connecting to the signal with a bad stage instance causes an assert.
SceneCreatedStatusFunctor sceneCreatedFunctor( signalCalled );
try
{
- stage.SceneCreatedSignal().Connect( &app, sceneCreatedFunctor );
+ stage.SceneCreatedSignal().Connect( &application, sceneCreatedFunctor );
}
catch( Dali::DaliException& e )
{
int UtcDaliStageGetRenderTaskListP(void)
{
- TestApplication app;
+ TestApplication application;
Stage stage = Stage::GetCurrent();
// Check we get a valid instance.
int UtcDaliStageGetRenderTaskListN(void)
{
- TestApplication app;
+ TestApplication application;
Stage stage;
// Check that getting the render task list with a bad stage instance causes an assert.
int UtcDaliStageGetObjectRegistryP(void)
{
- TestApplication app;
+ TestApplication application;
Stage stage = Stage::GetCurrent();
ObjectRegistry objectRegistry = stage.GetObjectRegistry();
// However we want a basic test to confirm the returned registry is valid and works.
bool verified = false;
ActorCreatedFunctor test( verified );
- objectRegistry.ObjectCreatedSignal().Connect( &app, test );
+ objectRegistry.ObjectCreatedSignal().Connect( &application, test );
Actor actor = Actor::New();
DALI_TEST_CHECK( test.mSignalVerified );
int UtcDaliStageGetObjectRegistryN(void)
{
- TestApplication app;
+ TestApplication application;
Stage stage;
// Check that getting the object registry with a bad stage instance DOES NOT cause an assert.
int UtcDaliStageOperatorAssign(void)
{
- TestApplication app;
+ TestApplication application;
Stage stage;
DALI_TEST_CHECK( !stage );
END_TEST;
}
+
+int UtcDaliStageRenderingBehavior(void)
+{
+ TestApplication application;
+ Stage stage = Stage::GetCurrent();
+
+ tet_infoline( "Check default rendering behavior is only if required" );
+ DALI_TEST_CHECK( DevelStage::GetRenderingBehavior( stage ) == DevelStage::Rendering::IF_REQUIRED );
+
+ tet_infoline( "No update required with an empty application" );
+ application.SendNotification();
+ DALI_TEST_CHECK( application.UpdateOnly() == false );
+ application.RenderOnly();
+
+ tet_infoline( "Change to continuous rendering, further updates should be required" );
+ DevelStage::SetRenderingBehavior( stage, DevelStage::Rendering::CONTINUOUSLY );
+
+ DALI_TEST_CHECK( DevelStage::GetRenderingBehavior( stage ) == DevelStage::Rendering::CONTINUOUSLY );
+
+ application.SendNotification();
+ DALI_TEST_CHECK( application.UpdateOnly() == true );
+ application.RenderOnly();
+
+ application.SendNotification();
+ DALI_TEST_CHECK( application.UpdateOnly() == true );
+ application.RenderOnly();
+
+ tet_infoline( "Change to rendering only if required, further updates should NOT be required" );
+ DevelStage::SetRenderingBehavior( stage, DevelStage::Rendering::IF_REQUIRED );
+
+ DALI_TEST_CHECK( DevelStage::GetRenderingBehavior( stage ) == DevelStage::Rendering::IF_REQUIRED );
+
+ application.SendNotification();
+ DALI_TEST_CHECK( application.UpdateOnly() == false );
+ application.RenderOnly();
+
+ tet_infoline( "The next update is not required so TestApplication should print a warning" );
+ application.SendNotification();
+ DALI_TEST_CHECK( application.UpdateOnly() == false );
+ application.RenderOnly();
+
+ END_TEST;
+}