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-Alignment.cpp;h=fc015f1465335cf2b0c3c7c86da05e4669c8aa49;hp=879dbb36495a27cc1a978ec87a196871e020e012;hb=acbf7e2c17c1578c7125fa07c7eaabe1fe214406;hpb=998d982768c7f211d948cfd7921ec27ff739ce49 diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Alignment.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Alignment.cpp index 879dbb3..fc015f1 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-Alignment.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-Alignment.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2015 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. @@ -39,9 +39,14 @@ void utc_dali_toolkit_alignment_cleanup(void) test_return_value = TET_PASS; } - namespace { +/// Compare an int (Or'd Alignment::Type) with an Alignment::Type value +void DALI_TEST_EQUALS( int value1, Alignment::Type value2, const char* location ) +{ + ::DALI_TEST_EQUALS< Alignment::Type >( static_cast< Alignment::Type >( value1 ), value2, location ); +} + static bool gObjectCreatedCallBackCalled; static void TestCallback(BaseHandle handle) @@ -63,12 +68,9 @@ int UtcDaliAlignmentConstructorNegative(void) alignment.SetPadding(padding); tet_result(TET_FAIL); } - catch (DaliException& exception) + catch (DaliException& e) { - if (exception.mCondition == "alignment") - { - tet_result(TET_PASS); - } + DALI_TEST_ASSERT(e, "alignment", TEST_LOCATION ); } END_TEST; } @@ -235,7 +237,7 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) // Default, HorizontalCenter, VerticalCenter - Ensure they do not change! { Alignment alignment = Alignment::New(); - alignment.Add(RenderableActor::New()); + alignment.Add(Actor::New()); Stage::GetCurrent().Add(alignment); application.Render(); application.SendNotification(); @@ -255,7 +257,7 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) // HorizontalLeft, VerticalCenter { Alignment alignment = Alignment::New(); - alignment.Add(RenderableActor::New()); + alignment.Add(Actor::New()); Stage::GetCurrent().Add(alignment); application.Render(); application.SendNotification(); @@ -275,7 +277,7 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) // HorizontalRight, VerticalCenter { Alignment alignment = Alignment::New(); - alignment.Add(RenderableActor::New()); + alignment.Add(Actor::New()); Stage::GetCurrent().Add(alignment); application.Render(); application.SendNotification(); @@ -295,7 +297,7 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) // HorizontalLeft, VerticalTop { Alignment alignment = Alignment::New(); - alignment.Add(RenderableActor::New()); + alignment.Add(Actor::New()); Stage::GetCurrent().Add(alignment); application.Render(); application.SendNotification(); @@ -315,7 +317,7 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) // HorizontalCenter, VerticalTop { Alignment alignment = Alignment::New(); - alignment.Add(RenderableActor::New()); + alignment.Add(Actor::New()); Stage::GetCurrent().Add(alignment); application.Render(); application.SendNotification(); @@ -335,7 +337,7 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) // HorizontalRight, VerticalTop { Alignment alignment = Alignment::New(); - alignment.Add(RenderableActor::New()); + alignment.Add(Actor::New()); Stage::GetCurrent().Add(alignment); application.Render(); application.SendNotification(); @@ -355,7 +357,7 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) // HorizontalLeft, VerticalBottom { Alignment alignment = Alignment::New(); - alignment.Add(RenderableActor::New()); + alignment.Add(Actor::New()); Stage::GetCurrent().Add(alignment); application.Render(); application.SendNotification(); @@ -375,7 +377,7 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) // HorizontalCenter, VerticalBottom { Alignment alignment = Alignment::New(); - alignment.Add(RenderableActor::New()); + alignment.Add(Actor::New()); Stage::GetCurrent().Add(alignment); application.Render(); application.SendNotification(); @@ -395,7 +397,7 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) // HorizontalRight, VerticalBottom { Alignment alignment = Alignment::New(); - alignment.Add(RenderableActor::New()); + alignment.Add(Actor::New()); Stage::GetCurrent().Add(alignment); application.Render(); application.SendNotification(); @@ -422,19 +424,10 @@ int UtcDaliAlignmentSetAlignmentTypeNegative(void) { Alignment alignment = Alignment::New(); Alignment::Type type(Alignment::Type(Alignment::HorizontalLeft | Alignment::HorizontalCenter)); - - try - { - alignment.SetAlignmentType(type); - tet_result(TET_FAIL); - } - catch (DaliException& exception) - { - if (exception.mCondition == "!horizontalSet") - { - tet_result(TET_PASS); - } - } + alignment.SetAlignmentType(type); + // center will prevail in conflict + DALI_TEST_CHECK( Alignment::HorizontalCenter & alignment.GetAlignmentType() ); + DALI_TEST_CHECK( !(Alignment::HorizontalLeft & alignment.GetAlignmentType()) ); } // Setting HorizontalCenter, HorizontalRight @@ -442,56 +435,30 @@ int UtcDaliAlignmentSetAlignmentTypeNegative(void) Alignment alignment = Alignment::New(); Alignment::Type type(Alignment::Type(Alignment::HorizontalCenter | Alignment::HorizontalRight)); - try - { - alignment.SetAlignmentType(type); - tet_result(TET_FAIL); - } - catch (DaliException& exception) - { - if (exception.mCondition == "!horizontalSet") - { - tet_result(TET_PASS); - } - } + alignment.SetAlignmentType(type); + // center will prevail in conflict + DALI_TEST_CHECK( Alignment::HorizontalCenter & alignment.GetAlignmentType() ); + DALI_TEST_CHECK( !(Alignment::HorizontalRight & alignment.GetAlignmentType()) ); } // Setting VerticalTop, VerticalCenter { Alignment alignment = Alignment::New(); Alignment::Type type(Alignment::Type(Alignment::VerticalTop | Alignment::VerticalCenter)); - - try - { - alignment.SetAlignmentType(type); - tet_result(TET_FAIL); - } - catch (DaliException& exception) - { - if (exception.mCondition == "!verticalSet") - { - tet_result(TET_PASS); - } - } + alignment.SetAlignmentType(type); + // center will prevail in conflict + DALI_TEST_CHECK( Alignment::VerticalCenter & alignment.GetAlignmentType() ); + DALI_TEST_CHECK( !(Alignment::VerticalTop & alignment.GetAlignmentType()) ); } // Setting VerticalCenter, VerticalBottom { Alignment alignment = Alignment::New(); Alignment::Type type(Alignment::Type(Alignment::VerticalTop | Alignment::VerticalBottom)); - - try - { - alignment.SetAlignmentType(type); - tet_result(TET_FAIL); - } - catch (DaliException& exception) - { - if (exception.mCondition == "!veritcalSet") - { - tet_result(TET_PASS); - } - } + alignment.SetAlignmentType(type); + // top will prevail in conflict + DALI_TEST_CHECK( Alignment::VerticalTop & alignment.GetAlignmentType() ); + DALI_TEST_CHECK( !(Alignment::VerticalBottom & alignment.GetAlignmentType()) ); } END_TEST; } @@ -504,7 +471,7 @@ int UtcDaliAlignmentGetAlignmentType(void) { Alignment alignment = Alignment::New(); DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); - alignment.Add(RenderableActor::New()); + alignment.Add(Actor::New()); Stage::GetCurrent().Add(alignment); application.Render(); application.SendNotification(); @@ -517,7 +484,7 @@ int UtcDaliAlignmentGetAlignmentType(void) { Alignment alignment = Alignment::New(Alignment::HorizontalLeft); DALI_TEST_EQUALS(Alignment::HorizontalLeft | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); - alignment.Add(RenderableActor::New()); + alignment.Add(Actor::New()); Stage::GetCurrent().Add(alignment); application.Render(); application.SendNotification(); @@ -530,7 +497,7 @@ int UtcDaliAlignmentGetAlignmentType(void) { Alignment alignment = Alignment::New(Alignment::HorizontalRight); DALI_TEST_EQUALS(Alignment::HorizontalRight | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); - alignment.Add(RenderableActor::New()); + alignment.Add(Actor::New()); Stage::GetCurrent().Add(alignment); application.Render(); application.SendNotification(); @@ -543,7 +510,7 @@ int UtcDaliAlignmentGetAlignmentType(void) { Alignment alignment = Alignment::New(Alignment::HorizontalLeft, Alignment::VerticalTop); DALI_TEST_EQUALS(Alignment::HorizontalLeft | Alignment::VerticalTop, alignment.GetAlignmentType(), TEST_LOCATION); - alignment.Add(RenderableActor::New()); + alignment.Add(Actor::New()); Stage::GetCurrent().Add(alignment); application.Render(); application.SendNotification(); @@ -556,7 +523,7 @@ int UtcDaliAlignmentGetAlignmentType(void) { Alignment alignment = Alignment::New(Alignment::HorizontalCenter, Alignment::VerticalTop); DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalTop, alignment.GetAlignmentType(), TEST_LOCATION); - alignment.Add(RenderableActor::New()); + alignment.Add(Actor::New()); Stage::GetCurrent().Add(alignment); application.Render(); application.SendNotification(); @@ -569,7 +536,7 @@ int UtcDaliAlignmentGetAlignmentType(void) { Alignment alignment = Alignment::New(Alignment::HorizontalRight, Alignment::VerticalTop); DALI_TEST_EQUALS(Alignment::HorizontalRight | Alignment::VerticalTop, alignment.GetAlignmentType(), TEST_LOCATION); - alignment.Add(RenderableActor::New()); + alignment.Add(Actor::New()); Stage::GetCurrent().Add(alignment); application.Render(); application.SendNotification(); @@ -582,7 +549,7 @@ int UtcDaliAlignmentGetAlignmentType(void) { Alignment alignment = Alignment::New(Alignment::HorizontalLeft, Alignment::VerticalBottom); DALI_TEST_EQUALS(Alignment::HorizontalLeft | Alignment::VerticalBottom, alignment.GetAlignmentType(), TEST_LOCATION); - alignment.Add(RenderableActor::New()); + alignment.Add(Actor::New()); Stage::GetCurrent().Add(alignment); application.Render(); application.SendNotification(); @@ -595,7 +562,7 @@ int UtcDaliAlignmentGetAlignmentType(void) { Alignment alignment = Alignment::New(Alignment::HorizontalCenter, Alignment::VerticalBottom); DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalBottom, alignment.GetAlignmentType(), TEST_LOCATION); - alignment.Add(RenderableActor::New()); + alignment.Add(Actor::New()); Stage::GetCurrent().Add(alignment); application.Render(); application.SendNotification(); @@ -608,7 +575,7 @@ int UtcDaliAlignmentGetAlignmentType(void) { Alignment alignment = Alignment::New(Alignment::HorizontalRight, Alignment::VerticalBottom); DALI_TEST_EQUALS(Alignment::HorizontalRight | Alignment::VerticalBottom, alignment.GetAlignmentType(), TEST_LOCATION); - alignment.Add(RenderableActor::New()); + alignment.Add(Actor::New()); Stage::GetCurrent().Add(alignment); application.Render(); application.SendNotification(); @@ -626,7 +593,7 @@ int UtcDaliAlignmentSetScaling(void) // ScaleToFill { Alignment alignment = Alignment::New(); - alignment.Add(RenderableActor::New()); + alignment.Add(Actor::New()); Stage::GetCurrent().Add(alignment); application.Render(); application.SendNotification(); @@ -659,7 +626,7 @@ int UtcDaliAlignmentSetScaling(void) // ScaleToFitKeepAspect { Alignment alignment = Alignment::New(); - alignment.Add(RenderableActor::New()); + alignment.Add(Actor::New()); Stage::GetCurrent().Add(alignment); application.Render(); application.SendNotification(); @@ -692,7 +659,7 @@ int UtcDaliAlignmentSetScaling(void) // ScaleToFillKeepAspect { Alignment alignment = Alignment::New(); - alignment.Add(RenderableActor::New()); + alignment.Add(Actor::New()); Stage::GetCurrent().Add(alignment); application.Render(); application.SendNotification(); @@ -725,7 +692,7 @@ int UtcDaliAlignmentSetScaling(void) // ShrinkToFit { Alignment alignment = Alignment::New(); - alignment.Add(RenderableActor::New()); + alignment.Add(Actor::New()); Stage::GetCurrent().Add(alignment); application.Render(); application.SendNotification(); @@ -758,7 +725,7 @@ int UtcDaliAlignmentSetScaling(void) // ShrinkToFitKeepAspect { Alignment alignment = Alignment::New(); - alignment.Add(RenderableActor::New()); + alignment.Add(Actor::New()); Stage::GetCurrent().Add(alignment); application.Render(); application.SendNotification(); @@ -874,12 +841,9 @@ int UtcDaliAlignmentSetPaddingNegative(void) alignment.SetPadding(padding); tet_result(TET_FAIL); } - catch (DaliException& exception) + catch (DaliException& e) { - if (exception.mCondition == "( padding.left >= 0.f ) && ( padding.top >= 0.f ) && ( padding.right >= 0.f ) && ( padding.bottom >= 0.f )") - { - tet_result(TET_PASS); - } + DALI_TEST_ASSERT(e, "( padding.left >= 0.f ) && ( padding.top >= 0.f ) && ( padding.right >= 0.f ) && ( padding.bottom >= 0.f )", TEST_LOCATION ); } try @@ -888,12 +852,9 @@ int UtcDaliAlignmentSetPaddingNegative(void) alignment.SetPadding(padding); tet_result(TET_FAIL); } - catch (DaliException& exception) + catch (DaliException& e) { - if (exception.mCondition == "( padding.left >= 0.f ) && ( padding.top >= 0.f ) && ( padding.right >= 0.f ) && ( padding.bottom >= 0.f )") - { - tet_result(TET_PASS); - } + DALI_TEST_ASSERT(e, "( padding.left >= 0.f ) && ( padding.top >= 0.f ) && ( padding.right >= 0.f ) && ( padding.bottom >= 0.f )", TEST_LOCATION ); } try @@ -902,12 +863,9 @@ int UtcDaliAlignmentSetPaddingNegative(void) alignment.SetPadding(padding); tet_result(TET_FAIL); } - catch (DaliException& exception) + catch (DaliException& e) { - if (exception.mCondition == "( padding.left >= 0.f ) && ( padding.top >= 0.f ) && ( padding.right >= 0.f ) && ( padding.bottom >= 0.f )") - { - tet_result(TET_PASS); - } + DALI_TEST_ASSERT(e, "( padding.left >= 0.f ) && ( padding.top >= 0.f ) && ( padding.right >= 0.f ) && ( padding.bottom >= 0.f )", TEST_LOCATION ); } try @@ -916,12 +874,9 @@ int UtcDaliAlignmentSetPaddingNegative(void) alignment.SetPadding(padding); tet_result(TET_FAIL); } - catch (DaliException& exception) + catch (DaliException& e) { - if (exception.mCondition == "( padding.left >= 0.f ) && ( padding.top >= 0.f ) && ( padding.right >= 0.f ) && ( padding.bottom >= 0.f )") - { - tet_result(TET_PASS); - } + DALI_TEST_ASSERT(e, "( padding.left >= 0.f ) && ( padding.top >= 0.f ) && ( padding.right >= 0.f ) && ( padding.bottom >= 0.f )", TEST_LOCATION ); } END_TEST; } @@ -955,7 +910,7 @@ int UtcDaliAlignmentChildAddAndRemove(void) application.Render(); application.SendNotification(); - Actor actor = RenderableActor::New(); + Actor actor = Actor::New(); alignment.Add(actor); DALI_TEST_EQUALS(alignment.GetChildCount(), 1u, TEST_LOCATION); @@ -974,7 +929,7 @@ int UtcDaliAlignmentChildAddAndRemove(void) END_TEST; } -int UtcDaliAlignmentOnSizeSet(void) +int UtcDaliAlignmentSizeSetP(void) { ToolkitTestApplication application; @@ -984,7 +939,7 @@ int UtcDaliAlignmentOnSizeSet(void) application.Render(); application.SendNotification(); - Vector3 size(100.0f, 200.0f, 0.0f); + Vector2 size( 100.0f, 200.0f ); alignment.SetSize(size); application.Render(); @@ -992,14 +947,14 @@ int UtcDaliAlignmentOnSizeSet(void) application.Render(); application.SendNotification(); - DALI_TEST_EQUALS(size, alignment.GetImplementation().GetControlSize(), TEST_LOCATION); + DALI_TEST_EQUALS(size, alignment.GetTargetSize().GetVectorXY(), TEST_LOCATION); Stage::GetCurrent().Remove(alignment); END_TEST; } /////////////////////////////////////////////////////////////////////////////// -static bool TouchEventCallback(Actor actor, const TouchEvent& event) +static bool TouchCallback(Actor actor, const TouchData& event) { return false; } @@ -1015,7 +970,7 @@ int UtcDaliAlignmentOnTouchEvent(void) alignment.SetAnchorPoint(AnchorPoint::TOP_LEFT); Stage::GetCurrent().Add(alignment); - alignment.TouchedSignal().Connect(&TouchEventCallback); + alignment.TouchSignal().Connect(&TouchCallback); application.Render(); application.SendNotification(); @@ -1023,7 +978,10 @@ int UtcDaliAlignmentOnTouchEvent(void) application.SendNotification(); Integration::TouchEvent touchEvent(1); - TouchPoint point(1, TouchPoint::Down, 20.0f, 20.0f); + Integration::Point point; + point.SetDeviceId( 1 ); + point.SetState( PointState::DOWN); + point.SetScreenPosition( Vector2( 20.0f, 20.0f ) ); touchEvent.AddPoint(point); application.ProcessEvent(touchEvent); @@ -1060,7 +1018,7 @@ int UtcDaliAlignmentOnSizeAnimation(void) Stage::GetCurrent().Add(alignment); Animation animation = Animation::New(100.0f); - animation.Resize(alignment, Vector3(100.0f, 150.0f, 200.0f)); + animation.AnimateTo( Property( alignment, Actor::Property::SIZE ), Vector3( 100.0f, 150.0f, 200.0f ) ); animation.Play(); application.Render();