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-FlexNode.cpp;h=4cfdd91d72d591dc0845cc8708eb268cb5dd1674;hp=307c14984d989498f328238022d3a2ee79655d88;hb=ded68bd82415ca96ae7ec9926cdd3cda8bc05707;hpb=facc5c0abe18ba940652ae1a45ce0566ee76fd76 diff --git a/automated-tests/src/dali-toolkit/utc-Dali-FlexNode.cpp b/automated-tests/src/dali-toolkit/utc-Dali-FlexNode.cpp index 307c149..4cfdd91 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-FlexNode.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-FlexNode.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2020 Samsung Electronics Co., Ltd. + * Copyright (c) 2022 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. @@ -15,12 +15,14 @@ * */ -#include #include +#include + #include + #include -#include #include +#include using namespace Dali; using namespace Toolkit; @@ -37,28 +39,27 @@ void dali_flexNodeContainer_cleanup(void) namespace { +const Flex::SizeTuple ITEM_SIZE = Flex::SizeTuple{10.0f, 10.0f}; +const Flex::SizeTuple ITEM_SIZE_CALLBACK_TEST = Flex::SizeTuple{15.0f, 15.0f}; -const Flex::SizeTuple ITEM_SIZE = Flex::SizeTuple{ 10.0f, 10.0f }; -const Flex::SizeTuple ITEM_SIZE_CALLBACK_TEST = Flex::SizeTuple{ 15.0f, 15.0f }; - -void MeasureChild( Actor child, float width, int measureModeWidth, float height, int measureModeHeight, Flex::SizeTuple *childSize) +void MeasureChild(Actor child, float width, int measureModeWidth, float height, int measureModeHeight, Flex::SizeTuple* childSize) { *childSize = ITEM_SIZE; - if (child.GetProperty< std::string >( Dali::Actor::Property::NAME ) == "callbackTest") + if(child.GetProperty(Dali::Actor::Property::NAME) == "callbackTest") { *childSize = ITEM_SIZE_CALLBACK_TEST; } - tet_printf(" MeasureChild test callback executed (%f,%f)\n", childSize->width, childSize->height ); + tet_printf(" MeasureChild test callback executed (%f,%f)\n", childSize->width, childSize->height); } -} +} // namespace int UtcDaliToolkitFlexNodeConstructorP(void) { ToolkitTestApplication application; tet_infoline(" UtcDaliToolkitFlexNodeNewP"); Flex::Node* flexNode = new Flex::Node(); - DALI_TEST_CHECK( flexNode ); + DALI_TEST_CHECK(flexNode); END_TEST; } @@ -67,19 +68,19 @@ int UtcDaliToolkitFlexNodeAddChildWithMarginP(void) ToolkitTestApplication application; tet_infoline(" UtcDaliToolkitFlexNodeAddChildWithMarginP"); Flex::Node* flexNode = new Flex::Node(); - DALI_TEST_CHECK( flexNode ); + DALI_TEST_CHECK(flexNode); // Position elements as a Row flexNode->SetFlexDirection(Flex::FlexDirection::ROW); // Create two actors and add them to the parent flex node Actor actor = Actor::New(); - DALI_TEST_CHECK( actor ); + DALI_TEST_CHECK(actor); - Extents margin( 5,5,5,5); + Extents margin(5, 5, 5, 5); flexNode->AddChild(actor, margin, &MeasureChild, 0); - DALI_TEST_EQUALS( (int)flexNode->GetFlexDirection(), (int)Flex::FlexDirection::ROW, TEST_LOCATION ); + DALI_TEST_EQUALS((int)flexNode->GetFlexDirection(), (int)Flex::FlexDirection::ROW, TEST_LOCATION); flexNode->CalculateLayout(480, 800, false); @@ -87,7 +88,7 @@ int UtcDaliToolkitFlexNodeAddChildWithMarginP(void) tet_printf("Actor frame(left:%f,top:%f,right:%f,bottom:%f)\n", actorFrame.x, actorFrame.y, actorFrame.z, actorFrame.w); - DALI_TEST_EQUALS( actorFrame, Vector4( 5.0f, 5.0f, ITEM_SIZE.width+5, ITEM_SIZE.height+5 ), TEST_LOCATION ); + DALI_TEST_EQUALS(actorFrame, Vector4(5.0f, 5.0f, ITEM_SIZE.width + 5, ITEM_SIZE.height + 5), TEST_LOCATION); END_TEST; } @@ -97,7 +98,7 @@ int UtcDaliToolkitFlexNodeAddChildrenRowP(void) ToolkitTestApplication application; tet_infoline(" UtcDaliToolkitFlexNodeAddChildrenRowP"); Flex::Node* flexNode = new Flex::Node(); - DALI_TEST_CHECK( flexNode ); + DALI_TEST_CHECK(flexNode); // Position elements as a Row flexNode->SetFlexDirection(Flex::FlexDirection::ROW); @@ -105,13 +106,13 @@ int UtcDaliToolkitFlexNodeAddChildrenRowP(void) // Create two actors and add them to the parent flex node Actor actor1 = Actor::New(); Actor actor2 = Actor::New(); - DALI_TEST_CHECK( actor1 ); - DALI_TEST_CHECK( actor2 ); + DALI_TEST_CHECK(actor1); + DALI_TEST_CHECK(actor2); - flexNode->AddChild(actor1, Extents(0,0,0,0), &MeasureChild, 0); - flexNode->AddChild(actor2, Extents(0,0,0,0), &MeasureChild, 1); + flexNode->AddChild(actor1, Extents(0, 0, 0, 0), &MeasureChild, 0); + flexNode->AddChild(actor2, Extents(0, 0, 0, 0), &MeasureChild, 1); - DALI_TEST_EQUALS( (int)flexNode->GetFlexDirection(), (int)Flex::FlexDirection::ROW, TEST_LOCATION ); + DALI_TEST_EQUALS((int)flexNode->GetFlexDirection(), (int)Flex::FlexDirection::ROW, TEST_LOCATION); flexNode->CalculateLayout(480, 800, false); @@ -121,8 +122,8 @@ int UtcDaliToolkitFlexNodeAddChildrenRowP(void) tet_printf("Actor 1 frame(left:%f,top:%f,right:%f,bottom:%f)\n", actor1Frame.x, actor1Frame.y, actor1Frame.z, actor1Frame.w); tet_printf("Actor 2 frame(left:%f,top:%f,right:%f,bottom:%f)\n", actor2Frame.x, actor2Frame.y, actor2Frame.z, actor2Frame.w); - DALI_TEST_EQUALS( actor1Frame, Vector4( 0.0f, 0.0f, ITEM_SIZE.width, ITEM_SIZE.height ), TEST_LOCATION ); - DALI_TEST_EQUALS( actor2Frame, Vector4( ITEM_SIZE.width, 0.0f, ITEM_SIZE.width * 2, ITEM_SIZE.height ), TEST_LOCATION ); + DALI_TEST_EQUALS(actor1Frame, Vector4(0.0f, 0.0f, ITEM_SIZE.width, ITEM_SIZE.height), TEST_LOCATION); + DALI_TEST_EQUALS(actor2Frame, Vector4(ITEM_SIZE.width, 0.0f, ITEM_SIZE.width * 2, ITEM_SIZE.height), TEST_LOCATION); END_TEST; } @@ -132,7 +133,7 @@ int UtcDaliToolkitFlexNodeAddChildrenColumnP(void) ToolkitTestApplication application; tet_infoline("UtcDaliToolkitFlexNodeAddChildrenColumnP"); Flex::Node* flexNode = new Flex::Node(); - DALI_TEST_CHECK( flexNode ); + DALI_TEST_CHECK(flexNode); // Position elements in a Column flexNode->SetFlexDirection(Flex::FlexDirection::COLUMN); @@ -140,66 +141,65 @@ int UtcDaliToolkitFlexNodeAddChildrenColumnP(void) // Create two actors and add them to the parent flex node Actor actor1 = Actor::New(); Actor actor2 = Actor::New(); - DALI_TEST_CHECK( actor1 ); - DALI_TEST_CHECK( actor2 ); + DALI_TEST_CHECK(actor1); + DALI_TEST_CHECK(actor2); - flexNode->AddChild(actor1, Extents(0,0,0,0), &MeasureChild, 0); - flexNode->AddChild(actor2, Extents(0,0,0,0), &MeasureChild, 1); + flexNode->AddChild(actor1, Extents(0, 0, 0, 0), &MeasureChild, 0); + flexNode->AddChild(actor2, Extents(0, 0, 0, 0), &MeasureChild, 1); flexNode->CalculateLayout(480, 800, false); - Vector4 root = flexNode->GetNodeFrame(-1); // -1 is the root - Vector4 actor1Frame = flexNode->GetNodeFrame(0); // 0 is first child - Vector4 actor2Frame = flexNode->GetNodeFrame(1); // 1 is second child + Vector4 root = flexNode->GetNodeFrame(-1); // -1 is the root + Vector4 actor1Frame = flexNode->GetNodeFrame(0); // 0 is first child + Vector4 actor2Frame = flexNode->GetNodeFrame(1); // 1 is second child tet_printf("Root frame(left:%f,top:%f,right:%f,bottom:%f)\n", root.x, root.y, root.z, root.w); tet_printf("Actor 1 frame(left:%f,top:%f,right:%f,bottom:%f)\n", actor1Frame.x, actor1Frame.y, actor1Frame.z, actor1Frame.w); tet_printf("Actor 2 frame(left:%f,top:%f,right:%f,bottom:%f)\n", actor2Frame.x, actor2Frame.y, actor2Frame.z, actor2Frame.w); - DALI_TEST_EQUALS( actor1Frame, Vector4( 0.0f, 0.0f, ITEM_SIZE.width, ITEM_SIZE.height ), TEST_LOCATION ); - DALI_TEST_EQUALS( actor2Frame, Vector4( 0.0f, ITEM_SIZE.height, ITEM_SIZE.width, ITEM_SIZE.height *2 ), TEST_LOCATION ); + DALI_TEST_EQUALS(actor1Frame, Vector4(0.0f, 0.0f, ITEM_SIZE.width, ITEM_SIZE.height), TEST_LOCATION); + DALI_TEST_EQUALS(actor2Frame, Vector4(0.0f, ITEM_SIZE.height, ITEM_SIZE.width, ITEM_SIZE.height * 2), TEST_LOCATION); END_TEST; } - int UtcDaliToolkitFlexNodeAddChildrenColumnJustify(void) { ToolkitTestApplication application; tet_infoline("UtcDaliToolkitFlexNodeAddChildrenColumnJustify"); Flex::Node* flexNode = new Flex::Node(); - DALI_TEST_CHECK( flexNode ); + DALI_TEST_CHECK(flexNode); // Position elements in a Column flexNode->SetFlexDirection(Flex::FlexDirection::COLUMN); tet_infoline("Justify to the Start, align to start, third item should be displayed at the top and the end"); flexNode->SetFlexJustification(Flex::Justification::FLEX_START); - flexNode->SetFlexItemsAlignment( Flex::Alignment::FLEX_START ); + flexNode->SetFlexItemsAlignment(Flex::Alignment::FLEX_START); // Create three actors and add them to the parent flex node Actor actor1 = Actor::New(); Actor actor2 = Actor::New(); Actor actor3 = Actor::New(); - DALI_TEST_CHECK( actor1 ); - DALI_TEST_CHECK( actor2 ); - DALI_TEST_CHECK( actor3 ); + DALI_TEST_CHECK(actor1); + DALI_TEST_CHECK(actor2); + DALI_TEST_CHECK(actor3); - DALI_TEST_EQUALS( (int)flexNode->GetFlexJustification(), (int)Flex::Justification::FLEX_START, TEST_LOCATION ); - DALI_TEST_EQUALS( (int)flexNode->GetFlexItemsAlignment(), (int)Flex::Alignment::FLEX_START, TEST_LOCATION ); + DALI_TEST_EQUALS((int)flexNode->GetFlexJustification(), (int)Flex::Justification::FLEX_START, TEST_LOCATION); + DALI_TEST_EQUALS((int)flexNode->GetFlexItemsAlignment(), (int)Flex::Alignment::FLEX_START, TEST_LOCATION); - flexNode->AddChild(actor1, Extents(0,0,0,0), &MeasureChild, 0); - flexNode->AddChild(actor2, Extents(0,0,0,0), &MeasureChild, 1); - Flex::Node* actor3node = flexNode->AddChild(actor3, Extents(0,0,0,0), &MeasureChild, 2); - actor3node->SetFlexAlignmentSelf( Flex::Alignment::FLEX_END ); + flexNode->AddChild(actor1, Extents(0, 0, 0, 0), &MeasureChild, 0); + flexNode->AddChild(actor2, Extents(0, 0, 0, 0), &MeasureChild, 1); + Flex::Node* actor3node = flexNode->AddChild(actor3, Extents(0, 0, 0, 0), &MeasureChild, 2); + actor3node->SetFlexAlignmentSelf(Flex::Alignment::FLEX_END); flexNode->CalculateLayout(480, 800, false); - Vector4 root = flexNode->GetNodeFrame(-1); // -1 is the root - Vector4 actor1Frame = flexNode->GetNodeFrame(0); // 0 is first child - Vector4 actor2Frame = flexNode->GetNodeFrame(1); // 1 is second child - Vector4 actor3Frame = flexNode->GetNodeFrame(2); // 2 is third child + Vector4 root = flexNode->GetNodeFrame(-1); // -1 is the root + Vector4 actor1Frame = flexNode->GetNodeFrame(0); // 0 is first child + Vector4 actor2Frame = flexNode->GetNodeFrame(1); // 1 is second child + Vector4 actor3Frame = flexNode->GetNodeFrame(2); // 2 is third child tet_printf("Root frame(left:%f,top:%f,right:%f,bottom:%f)\n", root.x, root.y, root.z, root.w); @@ -217,21 +217,21 @@ int UtcDaliToolkitFlexNodeAddChildrenColumnJustify(void) --------- */ - DALI_TEST_EQUALS( actor1Frame, Vector4( 0.0f, 0.0f, ITEM_SIZE.width, ITEM_SIZE.height ), TEST_LOCATION ); - DALI_TEST_EQUALS( actor2Frame, Vector4( 0.0f, ITEM_SIZE.height, ITEM_SIZE.width, ITEM_SIZE.height *2 ), TEST_LOCATION ); - DALI_TEST_EQUALS( actor3Frame, Vector4( root.z - ITEM_SIZE.width, ITEM_SIZE.height *2, root.z, ITEM_SIZE.height *3 ), TEST_LOCATION ); + DALI_TEST_EQUALS(actor1Frame, Vector4(0.0f, 0.0f, ITEM_SIZE.width, ITEM_SIZE.height), TEST_LOCATION); + DALI_TEST_EQUALS(actor2Frame, Vector4(0.0f, ITEM_SIZE.height, ITEM_SIZE.width, ITEM_SIZE.height * 2), TEST_LOCATION); + DALI_TEST_EQUALS(actor3Frame, Vector4(root.z - ITEM_SIZE.width, ITEM_SIZE.height * 2, root.z, ITEM_SIZE.height * 3), TEST_LOCATION); tet_infoline(" Justify to the End, items should now be displayed at the bottom, third item should now be displayed at the end"); - flexNode->SetFlexJustification( Flex::Justification::FLEX_END ); - flexNode->SetFlexItemsAlignment( Flex::Alignment::FLEX_START ); + flexNode->SetFlexJustification(Flex::Justification::FLEX_END); + flexNode->SetFlexItemsAlignment(Flex::Alignment::FLEX_START); // Recalulate layout flexNode->CalculateLayout(480, 800, false); - root = flexNode->GetNodeFrame(-1); // -1 is the root - actor1Frame = flexNode->GetNodeFrame(0); // 0 is first child - actor2Frame = flexNode->GetNodeFrame(1); // 1 is second child - actor3Frame = flexNode->GetNodeFrame(2); // 2 is third child + root = flexNode->GetNodeFrame(-1); // -1 is the root + actor1Frame = flexNode->GetNodeFrame(0); // 0 is first child + actor2Frame = flexNode->GetNodeFrame(1); // 1 is second child + actor3Frame = flexNode->GetNodeFrame(2); // 2 is third child tet_printf("Root frame(left:%f,top:%f,right:%f,bottom:%f)\n", root.x, root.y, root.z, root.w); @@ -249,20 +249,20 @@ int UtcDaliToolkitFlexNodeAddChildrenColumnJustify(void) --------- */ - DALI_TEST_EQUALS( actor1Frame, Vector4( 0.0f, root.w - (ITEM_SIZE.height*3), ITEM_SIZE.width, root.w - (ITEM_SIZE.height*2) ), TEST_LOCATION ); - DALI_TEST_EQUALS( actor2Frame, Vector4( 0.0f, root.w - (ITEM_SIZE.height*2), ITEM_SIZE.width, root.w - ITEM_SIZE.height ), TEST_LOCATION ); - DALI_TEST_EQUALS( actor3Frame, Vector4( root.z - ITEM_SIZE.width, root.w - ITEM_SIZE.height, root.z, root.w ), TEST_LOCATION ); + DALI_TEST_EQUALS(actor1Frame, Vector4(0.0f, root.w - (ITEM_SIZE.height * 3), ITEM_SIZE.width, root.w - (ITEM_SIZE.height * 2)), TEST_LOCATION); + DALI_TEST_EQUALS(actor2Frame, Vector4(0.0f, root.w - (ITEM_SIZE.height * 2), ITEM_SIZE.width, root.w - ITEM_SIZE.height), TEST_LOCATION); + DALI_TEST_EQUALS(actor3Frame, Vector4(root.z - ITEM_SIZE.width, root.w - ITEM_SIZE.height, root.z, root.w), TEST_LOCATION); tet_infoline(" Align to End, items should now be displayed at the bottom and the end"); - flexNode->SetFlexJustification( Flex::Justification::FLEX_END ); - flexNode->SetFlexItemsAlignment( Flex::Alignment::FLEX_END ); + flexNode->SetFlexJustification(Flex::Justification::FLEX_END); + flexNode->SetFlexItemsAlignment(Flex::Alignment::FLEX_END); // Recalulate layout flexNode->CalculateLayout(480, 800, false); - root = flexNode->GetNodeFrame(-1); // -1 is the root - actor1Frame = flexNode->GetNodeFrame(0); // 0 is first child - actor2Frame = flexNode->GetNodeFrame(1); // 1 is second child - actor3Frame = flexNode->GetNodeFrame(2); // 2 is third child + root = flexNode->GetNodeFrame(-1); // -1 is the root + actor1Frame = flexNode->GetNodeFrame(0); // 0 is first child + actor2Frame = flexNode->GetNodeFrame(1); // 1 is second child + actor3Frame = flexNode->GetNodeFrame(2); // 2 is third child tet_printf("Actor 1 frame(left:%f,top:%f,right:%f,bottom:%f)\n", actor1Frame.x, actor1Frame.y, actor1Frame.z, actor1Frame.w); tet_printf("Actor 2 frame(left:%f,top:%f,right:%f,bottom:%f)\n", actor2Frame.x, actor2Frame.y, actor2Frame.z, actor2Frame.w); @@ -278,9 +278,9 @@ int UtcDaliToolkitFlexNodeAddChildrenColumnJustify(void) --------- */ - DALI_TEST_EQUALS( actor1Frame, Vector4( root.z - ITEM_SIZE.width, root.w - (ITEM_SIZE.height*3), root.z, root.w - (ITEM_SIZE.height*2) ), TEST_LOCATION ); - DALI_TEST_EQUALS( actor2Frame, Vector4( root.z - ITEM_SIZE.width, root.w - (ITEM_SIZE.height*2), root.z, root.w - ITEM_SIZE.height ), TEST_LOCATION ); - DALI_TEST_EQUALS( actor3Frame, Vector4( root.z - ITEM_SIZE.width, root.w - ITEM_SIZE.height, root.z, root.w ), TEST_LOCATION ); + DALI_TEST_EQUALS(actor1Frame, Vector4(root.z - ITEM_SIZE.width, root.w - (ITEM_SIZE.height * 3), root.z, root.w - (ITEM_SIZE.height * 2)), TEST_LOCATION); + DALI_TEST_EQUALS(actor2Frame, Vector4(root.z - ITEM_SIZE.width, root.w - (ITEM_SIZE.height * 2), root.z, root.w - ITEM_SIZE.height), TEST_LOCATION); + DALI_TEST_EQUALS(actor3Frame, Vector4(root.z - ITEM_SIZE.width, root.w - ITEM_SIZE.height, root.z, root.w), TEST_LOCATION); END_TEST; } @@ -290,21 +290,21 @@ int UtcDaliToolkitFlexNodeSizingP(void) ToolkitTestApplication application; tet_infoline(" UtcDaliToolkitFlexNodeSizingP"); Flex::Node* flexNode = new Flex::Node(); - DALI_TEST_CHECK( flexNode ); + DALI_TEST_CHECK(flexNode); // Create two actors and add them to the parent flex node Actor actor1 = Actor::New(); Actor actor2 = Actor::New(); - DALI_TEST_CHECK( actor1 ); - DALI_TEST_CHECK( actor2 ); + DALI_TEST_CHECK(actor1); + DALI_TEST_CHECK(actor2); - flexNode->AddChild(actor1, Extents(0,0,0,0), &MeasureChild, 0); - flexNode->AddChild(actor2, Extents(0,0,0,0), &MeasureChild, 1); + flexNode->AddChild(actor1, Extents(0, 0, 0, 0), &MeasureChild, 0); + flexNode->AddChild(actor2, Extents(0, 0, 0, 0), &MeasureChild, 1); flexNode->CalculateLayout(480, 800, false); - DALI_TEST_EQUALS( flexNode->GetFlexWidth(), 480.0f, TEST_LOCATION ); - DALI_TEST_EQUALS( flexNode->GetFlexHeight(), 800.0f, TEST_LOCATION ); + DALI_TEST_EQUALS(flexNode->GetFlexWidth(), 480.0f, TEST_LOCATION); + DALI_TEST_EQUALS(flexNode->GetFlexHeight(), 800.0f, TEST_LOCATION); END_TEST; } @@ -314,12 +314,12 @@ int UtcDaliToolkitFlexNodeWrapModeP(void) ToolkitTestApplication application; tet_infoline("UtcDaliToolkitFlexNodeWrapModeP"); Flex::Node* flexNode = new Flex::Node(); - DALI_TEST_CHECK( flexNode ); + DALI_TEST_CHECK(flexNode); // Position elements in a Column - flexNode->SetFlexDirection( Flex::FlexDirection::ROW ); - flexNode->SetFlexAlignment( Flex::Alignment::FLEX_START ); - flexNode->SetFlexWrap( Flex::WrapType::NO_WRAP ); + flexNode->SetFlexDirection(Flex::FlexDirection::ROW); + flexNode->SetFlexAlignment(Flex::Alignment::FLEX_START); + flexNode->SetFlexWrap(Flex::WrapType::NO_WRAP); // Create two actors and add them to the parent flex node Actor actor1 = Actor::New(); @@ -327,23 +327,23 @@ int UtcDaliToolkitFlexNodeWrapModeP(void) Actor actor3 = Actor::New(); Actor actor4 = Actor::New(); - DALI_TEST_EQUALS( (int)flexNode->GetFlexJustification(), (int)Flex::Justification::FLEX_START, TEST_LOCATION ); - DALI_TEST_EQUALS( (int)flexNode->GetFlexItemsAlignment(), (int)Flex::Alignment::FLEX_START, TEST_LOCATION ); - DALI_TEST_EQUALS( (int)flexNode->GetFlexAlignment(), (int)Flex::Alignment::FLEX_START, TEST_LOCATION ); - DALI_TEST_EQUALS( (int)flexNode->GetFlexWrap(), (int)Flex::WrapType::NO_WRAP, TEST_LOCATION ); + DALI_TEST_EQUALS((int)flexNode->GetFlexJustification(), (int)Flex::Justification::FLEX_START, TEST_LOCATION); + DALI_TEST_EQUALS((int)flexNode->GetFlexItemsAlignment(), (int)Flex::Alignment::FLEX_START, TEST_LOCATION); + DALI_TEST_EQUALS((int)flexNode->GetFlexAlignment(), (int)Flex::Alignment::FLEX_START, TEST_LOCATION); + DALI_TEST_EQUALS((int)flexNode->GetFlexWrap(), (int)Flex::WrapType::NO_WRAP, TEST_LOCATION); - flexNode->AddChild( actor1, Extents(0,0,0,0), &MeasureChild, 0 ); - flexNode->AddChild( actor2, Extents(0,0,0,0), &MeasureChild, 1 ); - flexNode->AddChild( actor2, Extents(0,0,0,0), &MeasureChild, 2 ); - flexNode->AddChild( actor2, Extents(0,0,0,0), &MeasureChild, 3 ); + flexNode->AddChild(actor1, Extents(0, 0, 0, 0), &MeasureChild, 0); + flexNode->AddChild(actor2, Extents(0, 0, 0, 0), &MeasureChild, 1); + flexNode->AddChild(actor2, Extents(0, 0, 0, 0), &MeasureChild, 2); + flexNode->AddChild(actor2, Extents(0, 0, 0, 0), &MeasureChild, 3); flexNode->CalculateLayout(30, 800, false); - Vector4 root = flexNode->GetNodeFrame(-1); // -1 is the root - Vector4 actor1Frame = flexNode->GetNodeFrame(0); // 0 is first child - Vector4 actor2Frame = flexNode->GetNodeFrame(1); // 1 is second child - Vector4 actor3Frame = flexNode->GetNodeFrame(2); // 2 is first child - Vector4 actor4Frame = flexNode->GetNodeFrame(3); // 3 is second child + Vector4 root = flexNode->GetNodeFrame(-1); // -1 is the root + Vector4 actor1Frame = flexNode->GetNodeFrame(0); // 0 is first child + Vector4 actor2Frame = flexNode->GetNodeFrame(1); // 1 is second child + Vector4 actor3Frame = flexNode->GetNodeFrame(2); // 2 is first child + Vector4 actor4Frame = flexNode->GetNodeFrame(3); // 3 is second child tet_printf("Root frame(left:%f,top:%f,right:%f,bottom:%f)\n", root.x, root.y, root.z, root.w); tet_printf("Actor 1 frame(left:%f,top:%f,right:%f,bottom:%f)\n", actor1Frame.x, actor1Frame.y, actor1Frame.z, actor1Frame.w); @@ -361,17 +361,17 @@ int UtcDaliToolkitFlexNodeWrapModeP(void) ------- */ - DALI_TEST_EQUALS( actor1Frame, Vector4( 0.0f, 0.0f, ITEM_SIZE.width, ITEM_SIZE.height ), TEST_LOCATION ); - DALI_TEST_EQUALS( actor2Frame, Vector4( ITEM_SIZE.width, 0.0f, ITEM_SIZE.width*2, ITEM_SIZE.height ), TEST_LOCATION ); - DALI_TEST_EQUALS( actor3Frame, Vector4( ITEM_SIZE.width*2, 0.0f, ITEM_SIZE.width*3, ITEM_SIZE.height ), TEST_LOCATION ); - DALI_TEST_EQUALS( actor4Frame, Vector4( ITEM_SIZE.width*3, 0.0f, ITEM_SIZE.width*4, ITEM_SIZE.height ), TEST_LOCATION ); + DALI_TEST_EQUALS(actor1Frame, Vector4(0.0f, 0.0f, ITEM_SIZE.width, ITEM_SIZE.height), TEST_LOCATION); + DALI_TEST_EQUALS(actor2Frame, Vector4(ITEM_SIZE.width, 0.0f, ITEM_SIZE.width * 2, ITEM_SIZE.height), TEST_LOCATION); + DALI_TEST_EQUALS(actor3Frame, Vector4(ITEM_SIZE.width * 2, 0.0f, ITEM_SIZE.width * 3, ITEM_SIZE.height), TEST_LOCATION); + DALI_TEST_EQUALS(actor4Frame, Vector4(ITEM_SIZE.width * 3, 0.0f, ITEM_SIZE.width * 4, ITEM_SIZE.height), TEST_LOCATION); - flexNode->SetFlexWrap( Flex::WrapType::WRAP ); + flexNode->SetFlexWrap(Flex::WrapType::WRAP); - flexNode->CalculateLayout( 30, 800, false ); + flexNode->CalculateLayout(30, 800, false); root = flexNode->GetNodeFrame(-1); // -1 is the root - DALI_TEST_EQUALS( (int)flexNode->GetFlexWrap(), (int)Flex::WrapType::WRAP, TEST_LOCATION ); + DALI_TEST_EQUALS((int)flexNode->GetFlexWrap(), (int)Flex::WrapType::WRAP, TEST_LOCATION); tet_printf("Root frame(left:%f,top:%f,right:%f,bottom:%f)\n", root.x, root.y, root.z, root.w); actor1Frame = flexNode->GetNodeFrame(0); // 0 is first child @@ -394,11 +394,10 @@ int UtcDaliToolkitFlexNodeWrapModeP(void) ------- */ - DALI_TEST_EQUALS( actor1Frame, Vector4( 0.0f, 0.0f, ITEM_SIZE.width, ITEM_SIZE.height ), TEST_LOCATION ); - DALI_TEST_EQUALS( actor2Frame, Vector4( ITEM_SIZE.width, 0.0f, ITEM_SIZE.width*2, ITEM_SIZE.height ), TEST_LOCATION ); - DALI_TEST_EQUALS( actor3Frame, Vector4( ITEM_SIZE.width*2, 0.0f, ITEM_SIZE.width*3, ITEM_SIZE.height ), TEST_LOCATION ); - DALI_TEST_EQUALS( actor4Frame, Vector4( 0.0,ITEM_SIZE.height, ITEM_SIZE.width, ITEM_SIZE.height*2 ), TEST_LOCATION ); - + DALI_TEST_EQUALS(actor1Frame, Vector4(0.0f, 0.0f, ITEM_SIZE.width, ITEM_SIZE.height), TEST_LOCATION); + DALI_TEST_EQUALS(actor2Frame, Vector4(ITEM_SIZE.width, 0.0f, ITEM_SIZE.width * 2, ITEM_SIZE.height), TEST_LOCATION); + DALI_TEST_EQUALS(actor3Frame, Vector4(ITEM_SIZE.width * 2, 0.0f, ITEM_SIZE.width * 3, ITEM_SIZE.height), TEST_LOCATION); + DALI_TEST_EQUALS(actor4Frame, Vector4(0.0, ITEM_SIZE.height, ITEM_SIZE.width, ITEM_SIZE.height * 2), TEST_LOCATION); END_TEST; } @@ -408,19 +407,19 @@ int UtcDaliToolkitFlexNodeRemoveChildP(void) ToolkitTestApplication application; tet_infoline(" UtcDaliToolkitFlexNodeRemoveChildP"); Flex::Node* flexNode = new Flex::Node(); - DALI_TEST_CHECK( flexNode ); + DALI_TEST_CHECK(flexNode); // Create two actors and add them to the parent flex node Actor actor1 = Actor::New(); Actor actor2 = Actor::New(); - actor1.SetProperty( Dali::Actor::Property::NAME,"Actor1"); - actor2.SetProperty( Dali::Actor::Property::NAME,"Actor2"); + actor1.SetProperty(Dali::Actor::Property::NAME, "Actor1"); + actor2.SetProperty(Dali::Actor::Property::NAME, "Actor2"); - DALI_TEST_CHECK( actor1 ); - DALI_TEST_CHECK( actor2 ); + DALI_TEST_CHECK(actor1); + DALI_TEST_CHECK(actor2); - flexNode->AddChild(actor1, Extents(0,0,0,0), &MeasureChild, 0); - flexNode->AddChild(actor2, Extents(0,0,0,0), &MeasureChild, 1); + flexNode->AddChild(actor1, Extents(0, 0, 0, 0), &MeasureChild, 0); + flexNode->AddChild(actor2, Extents(0, 0, 0, 0), &MeasureChild, 1); flexNode->CalculateLayout(480, 800, false); @@ -430,7 +429,7 @@ int UtcDaliToolkitFlexNodeRemoveChildP(void) tet_printf("Actor 1 frame(%f,%f,%f,%f)\n", actor1Frame.x, actor1Frame.y, actor1Frame.z, actor1Frame.w); tet_printf("Actor 2 frame(%f,%f,%f,%f)\n", actor2Frame.x, actor2Frame.y, actor2Frame.z, actor2Frame.w); - DALI_TEST_EQUALS( actor2Frame, Vector4( 0.0f, ITEM_SIZE.width, ITEM_SIZE.width, ITEM_SIZE.height*2 ), TEST_LOCATION ); + DALI_TEST_EQUALS(actor2Frame, Vector4(0.0f, ITEM_SIZE.width, ITEM_SIZE.width, ITEM_SIZE.height * 2), TEST_LOCATION); flexNode->RemoveChild(actor1); @@ -441,7 +440,7 @@ int UtcDaliToolkitFlexNodeRemoveChildP(void) tet_printf("Actor 1 frame(%f,%f,%f,%f)\n", actor1Frame.x, actor1Frame.y, actor1Frame.z, actor1Frame.w); tet_printf("Actor 2 frame(%f,%f,%f,%f)\n", actor2Frame.x, actor2Frame.y, actor2Frame.z, actor2Frame.w); - DALI_TEST_EQUALS( actor2Frame, Vector4( 0.0f, 0.0f, ITEM_SIZE.width, ITEM_SIZE.height ), TEST_LOCATION ); + DALI_TEST_EQUALS(actor2Frame, Vector4(0.0f, 0.0f, ITEM_SIZE.width, ITEM_SIZE.height), TEST_LOCATION); END_TEST; } @@ -451,19 +450,19 @@ int UtcDaliToolkitFlexNodeRemoveAllChildrenP(void) ToolkitTestApplication application; tet_infoline(" UtcDaliToolkitFlexNodeRemoveAllChildrenP"); Flex::Node* flexNode = new Flex::Node(); - DALI_TEST_CHECK( flexNode ); + DALI_TEST_CHECK(flexNode); // Create two actors and add them to the parent flex node Actor actor1 = Actor::New(); Actor actor2 = Actor::New(); - actor1.SetProperty( Dali::Actor::Property::NAME,"Actor1"); - actor2.SetProperty( Dali::Actor::Property::NAME,"Actor2"); + actor1.SetProperty(Dali::Actor::Property::NAME, "Actor1"); + actor2.SetProperty(Dali::Actor::Property::NAME, "Actor2"); - DALI_TEST_CHECK( actor1 ); - DALI_TEST_CHECK( actor2 ); + DALI_TEST_CHECK(actor1); + DALI_TEST_CHECK(actor2); - flexNode->AddChild(actor1, Extents(0,0,0,0), &MeasureChild, 0); - flexNode->AddChild(actor2, Extents(0,0,0,0), &MeasureChild, 1); + flexNode->AddChild(actor1, Extents(0, 0, 0, 0), &MeasureChild, 0); + flexNode->AddChild(actor2, Extents(0, 0, 0, 0), &MeasureChild, 1); flexNode->CalculateLayout(480, 800, false); @@ -484,8 +483,8 @@ int UtcDaliToolkitFlexNodeRemoveAllChildrenP(void) tet_printf("Actor 1 frame(%f,%f,%f,%f)\n", actor1FrameRemoved.x, actor1FrameRemoved.y, actor1FrameRemoved.z, actor1FrameRemoved.w); tet_printf("Actor 2 frame(%f,%f,%f,%f)\n", actor2FrameRemoved.x, actor2FrameRemoved.y, actor2FrameRemoved.z, actor2FrameRemoved.w); - DALI_TEST_NOT_EQUALS( actor1Frame, actor1FrameRemoved, 0.1, TEST_LOCATION ); - DALI_TEST_NOT_EQUALS( actor2Frame, actor2FrameRemoved, 0.1, TEST_LOCATION ); + DALI_TEST_NOT_EQUALS(actor1Frame, actor1FrameRemoved, 0.1, TEST_LOCATION); + DALI_TEST_NOT_EQUALS(actor2Frame, actor2FrameRemoved, 0.1, TEST_LOCATION); END_TEST; } @@ -495,23 +494,23 @@ int UtcDaliToolkitFlexNodePaddingMarginP(void) ToolkitTestApplication application; tet_infoline(" UtcDaliToolkitFlexNodePaddingMarginP"); Flex::Node* flexNode = new Flex::Node(); - DALI_TEST_CHECK( flexNode ); - flexNode->SetFlexDirection( Flex::FlexDirection::ROW ); + DALI_TEST_CHECK(flexNode); + flexNode->SetFlexDirection(Flex::FlexDirection::ROW); // Create two actors and add them to the parent flex node Actor actor1 = Actor::New(); Actor actor2 = Actor::New(); - DALI_TEST_CHECK( actor1 ); - DALI_TEST_CHECK( actor2 ); + DALI_TEST_CHECK(actor1); + DALI_TEST_CHECK(actor2); - flexNode->AddChild(actor1, Extents(0,0,0,0), &MeasureChild, 0); - flexNode->AddChild(actor2, Extents(0,0,0,0), &MeasureChild, 1); + flexNode->AddChild(actor1, Extents(0, 0, 0, 0), &MeasureChild, 0); + flexNode->AddChild(actor2, Extents(0, 0, 0, 0), &MeasureChild, 1); - Extents padding( 5,5,5,5); - Extents margin( 5,5,5,5); + Extents padding(5, 5, 5, 5); + Extents margin(5, 5, 5, 5); - flexNode->SetPadding( padding ); - flexNode->SetMargin( margin ); + flexNode->SetPadding(padding); + flexNode->SetMargin(margin); flexNode->CalculateLayout(480, 800, false); @@ -526,8 +525,8 @@ int UtcDaliToolkitFlexNodePaddingMarginP(void) |ppppp| ------- */ - DALI_TEST_EQUALS( actor1Frame, Vector4( 5.0f, 5.0f, ITEM_SIZE.width +5 , ITEM_SIZE.height + 5 ), TEST_LOCATION ); - DALI_TEST_EQUALS( actor2Frame, Vector4( 5+ ITEM_SIZE.width, 5.0f, (ITEM_SIZE.width*2) +5, ITEM_SIZE.height +5 ), TEST_LOCATION ); + DALI_TEST_EQUALS(actor1Frame, Vector4(5.0f, 5.0f, ITEM_SIZE.width + 5, ITEM_SIZE.height + 5), TEST_LOCATION); + DALI_TEST_EQUALS(actor2Frame, Vector4(5 + ITEM_SIZE.width, 5.0f, (ITEM_SIZE.width * 2) + 5, ITEM_SIZE.height + 5), TEST_LOCATION); END_TEST; } @@ -537,7 +536,7 @@ int UtcDaliToolkitFlexNodeCallbackTestP(void) ToolkitTestApplication application; tet_infoline("UtcDaliToolkitFlexNodeCallbackTestP"); Flex::Node* flexNode = new Flex::Node(); - DALI_TEST_CHECK( flexNode ); + DALI_TEST_CHECK(flexNode); // Position elements in a Column flexNode->SetFlexDirection(Flex::FlexDirection::COLUMN); @@ -546,27 +545,27 @@ int UtcDaliToolkitFlexNodeCallbackTestP(void) Actor actor1 = Actor::New(); Actor actor2 = Actor::New(); - actor1.SetProperty( Dali::Actor::Property::NAME,"callbackTest"); + actor1.SetProperty(Dali::Actor::Property::NAME, "callbackTest"); - DALI_TEST_CHECK( actor1 ); - DALI_TEST_CHECK( actor2 ); + DALI_TEST_CHECK(actor1); + DALI_TEST_CHECK(actor2); - flexNode->AddChild(actor1, Extents(0,0,0,0), &MeasureChild, 0); - flexNode->AddChild(actor2, Extents(0,0,0,0), &MeasureChild, 1); + flexNode->AddChild(actor1, Extents(0, 0, 0, 0), &MeasureChild, 0); + flexNode->AddChild(actor2, Extents(0, 0, 0, 0), &MeasureChild, 1); flexNode->CalculateLayout(480, 800, false); - Vector4 root = flexNode->GetNodeFrame(-1); // -1 is the root - Vector4 actor1Frame = flexNode->GetNodeFrame(0); // 0 is first child - Vector4 actor2Frame = flexNode->GetNodeFrame(1); // 1 is second child + Vector4 root = flexNode->GetNodeFrame(-1); // -1 is the root + Vector4 actor1Frame = flexNode->GetNodeFrame(0); // 0 is first child + Vector4 actor2Frame = flexNode->GetNodeFrame(1); // 1 is second child tet_printf("Root frame(left:%f,top:%f,right:%f,bottom:%f)\n", root.x, root.y, root.z, root.w); tet_printf("Actor 1 frame(left:%f,top:%f,right:%f,bottom:%f)\n", actor1Frame.x, actor1Frame.y, actor1Frame.z, actor1Frame.w); tet_printf("Actor 2 frame(left:%f,top:%f,right:%f,bottom:%f)\n", actor2Frame.x, actor2Frame.y, actor2Frame.z, actor2Frame.w); - DALI_TEST_EQUALS( actor1Frame, Vector4( 0.0f, 0.0f, ITEM_SIZE_CALLBACK_TEST.width, ITEM_SIZE_CALLBACK_TEST.height ), TEST_LOCATION ); - DALI_TEST_EQUALS( actor2Frame, Vector4( 0.0f, ITEM_SIZE_CALLBACK_TEST.height, ITEM_SIZE.width, ITEM_SIZE_CALLBACK_TEST.height + ITEM_SIZE.height ), TEST_LOCATION ); + DALI_TEST_EQUALS(actor1Frame, Vector4(0.0f, 0.0f, ITEM_SIZE_CALLBACK_TEST.width, ITEM_SIZE_CALLBACK_TEST.height), TEST_LOCATION); + DALI_TEST_EQUALS(actor2Frame, Vector4(0.0f, ITEM_SIZE_CALLBACK_TEST.height, ITEM_SIZE.width, ITEM_SIZE_CALLBACK_TEST.height + ITEM_SIZE.height), TEST_LOCATION); END_TEST; } @@ -576,26 +575,26 @@ int UtcDaliToolkitFlexNodeFlexPositionType(void) ToolkitTestApplication application; tet_infoline("UtcDaliToolkitFlexNodeFlexPositionType"); Flex::Node* flexNode = new Flex::Node(); - DALI_TEST_CHECK( flexNode ); + DALI_TEST_CHECK(flexNode); tet_infoline(" FlexPositionType is RELATIVE by default"); // Create two actors and add them to the parent flex node Actor actor1 = Actor::New(); Actor actor2 = Actor::New(); - DALI_TEST_CHECK( actor1 ); - DALI_TEST_CHECK( actor2 ); + DALI_TEST_CHECK(actor1); + DALI_TEST_CHECK(actor2); - flexNode->AddChild(actor1, Extents(0,0,0,0), &MeasureChild, 0); - Flex::Node* actor2node = flexNode->AddChild(actor2, Extents(0,0,0,0), &MeasureChild, 1); + flexNode->AddChild(actor1, Extents(0, 0, 0, 0), &MeasureChild, 0); + Flex::Node* actor2node = flexNode->AddChild(actor2, Extents(0, 0, 0, 0), &MeasureChild, 1); - DALI_TEST_EQUALS( (int)actor2node->GetFlexPositionType(), (int)Flex::PositionType::RELATIVE, TEST_LOCATION ); + DALI_TEST_EQUALS((int)actor2node->GetFlexPositionType(), (int)Flex::PositionType::RELATIVE, TEST_LOCATION); flexNode->CalculateLayout(480, 800, false); - Vector4 root = flexNode->GetNodeFrame(-1); // -1 is the root - Vector4 actor1Frame = flexNode->GetNodeFrame(0); // 0 is first child - Vector4 actor2Frame = flexNode->GetNodeFrame(1); // 1 is second child + Vector4 root = flexNode->GetNodeFrame(-1); // -1 is the root + Vector4 actor1Frame = flexNode->GetNodeFrame(0); // 0 is first child + Vector4 actor2Frame = flexNode->GetNodeFrame(1); // 1 is second child tet_printf("Root frame(left:%f,top:%f,right:%f,bottom:%f)\n", root.x, root.y, root.z, root.w); @@ -612,18 +611,18 @@ int UtcDaliToolkitFlexNodeFlexPositionType(void) --------- */ - DALI_TEST_EQUALS( actor1Frame, Vector4( 0.0f, 0.0f, ITEM_SIZE.width, ITEM_SIZE.height ), TEST_LOCATION ); - DALI_TEST_EQUALS( actor2Frame, Vector4( 0.0f, ITEM_SIZE.height, ITEM_SIZE.width, ITEM_SIZE.height *2 ), TEST_LOCATION ); + DALI_TEST_EQUALS(actor1Frame, Vector4(0.0f, 0.0f, ITEM_SIZE.width, ITEM_SIZE.height), TEST_LOCATION); + DALI_TEST_EQUALS(actor2Frame, Vector4(0.0f, ITEM_SIZE.height, ITEM_SIZE.width, ITEM_SIZE.height * 2), TEST_LOCATION); tet_infoline(" ABSOLUTE FlexPositionType, second item should now be ignore any properties"); - actor2node->SetFlexPositionType( Flex::PositionType::ABSOLUTE ); + actor2node->SetFlexPositionType(Flex::PositionType::ABSOLUTE); // Recalulate layout flexNode->CalculateLayout(480, 800, false); - root = flexNode->GetNodeFrame(-1); // -1 is the root - actor1Frame = flexNode->GetNodeFrame(0); // 0 is first child - actor2Frame = flexNode->GetNodeFrame(1); // 1 is second child + root = flexNode->GetNodeFrame(-1); // -1 is the root + actor1Frame = flexNode->GetNodeFrame(0); // 0 is first child + actor2Frame = flexNode->GetNodeFrame(1); // 1 is second child tet_printf("Root frame(left:%f,top:%f,right:%f,bottom:%f)\n", root.x, root.y, root.z, root.w); @@ -640,8 +639,8 @@ int UtcDaliToolkitFlexNodeFlexPositionType(void) --------- */ - DALI_TEST_EQUALS( actor1Frame, Vector4( 0.0f, 0.0f, ITEM_SIZE.width, ITEM_SIZE.height ), TEST_LOCATION ); - DALI_TEST_EQUALS( actor2Frame, Vector4( 0.0f, 0.0f, ITEM_SIZE.width, ITEM_SIZE.height ), TEST_LOCATION ); + DALI_TEST_EQUALS(actor1Frame, Vector4(0.0f, 0.0f, ITEM_SIZE.width, ITEM_SIZE.height), TEST_LOCATION); + DALI_TEST_EQUALS(actor2Frame, Vector4(0.0f, 0.0f, ITEM_SIZE.width, ITEM_SIZE.height), TEST_LOCATION); END_TEST; } @@ -651,22 +650,22 @@ int UtcDaliToolkitFlexNodeFlexAspectRatio(void) ToolkitTestApplication application; tet_infoline("UtcDaliToolkitFlexNodeFlexAspectRatio"); Flex::Node* flexNode = new Flex::Node(); - DALI_TEST_CHECK( flexNode ); + DALI_TEST_CHECK(flexNode); // Create a actor and add them to the parent flex node Actor actor1 = Actor::New(); - DALI_TEST_CHECK( actor1 ); + DALI_TEST_CHECK(actor1); tet_infoline(" 1.0 FlexAspectRatio"); - Flex::Node* actor1node = flexNode->AddChild(actor1, Extents(0,0,0,0), &MeasureChild, 0); + Flex::Node* actor1node = flexNode->AddChild(actor1, Extents(0, 0, 0, 0), &MeasureChild, 0); actor1node->SetFlexAspectRatio(1.0); - DALI_TEST_EQUALS( actor1node->GetFlexAspectRatio(), 1.0f, TEST_LOCATION ); + DALI_TEST_EQUALS(actor1node->GetFlexAspectRatio(), 1.0f, TEST_LOCATION); flexNode->CalculateLayout(480, 800, false); - Vector4 root = flexNode->GetNodeFrame(-1); // -1 is the root - Vector4 actor1Frame = flexNode->GetNodeFrame(0); // 0 is first child + Vector4 root = flexNode->GetNodeFrame(-1); // -1 is the root + Vector4 actor1Frame = flexNode->GetNodeFrame(0); // 0 is first child tet_printf("Root frame(left:%f,top:%f,right:%f,bottom:%f)\n", root.x, root.y, root.z, root.w); @@ -682,18 +681,18 @@ int UtcDaliToolkitFlexNodeFlexAspectRatio(void) --------- */ - DALI_TEST_EQUALS( actor1Frame, Vector4( 0.0f, 0.0f, ITEM_SIZE.width, ITEM_SIZE.height ), TEST_LOCATION ); + DALI_TEST_EQUALS(actor1Frame, Vector4(0.0f, 0.0f, ITEM_SIZE.width, ITEM_SIZE.height), TEST_LOCATION); tet_infoline(" 2.0 FlexAspectRatio"); actor1node->SetFlexAspectRatio(2.0); - DALI_TEST_EQUALS( actor1node->GetFlexAspectRatio(), 2.0f, TEST_LOCATION ); + DALI_TEST_EQUALS(actor1node->GetFlexAspectRatio(), 2.0f, TEST_LOCATION); // Recalulate layout flexNode->CalculateLayout(480, 800, false); - root = flexNode->GetNodeFrame(-1); // -1 is the root - actor1Frame = flexNode->GetNodeFrame(0); // 0 is first child + root = flexNode->GetNodeFrame(-1); // -1 is the root + actor1Frame = flexNode->GetNodeFrame(0); // 0 is first child tet_printf("Root frame(left:%f,top:%f,right:%f,bottom:%f)\n", root.x, root.y, root.z, root.w); @@ -709,7 +708,7 @@ int UtcDaliToolkitFlexNodeFlexAspectRatio(void) --------- */ - DALI_TEST_EQUALS( actor1Frame, Vector4( 0.0f, 0.0f, ITEM_SIZE.width*2, ITEM_SIZE.height ), TEST_LOCATION ); + DALI_TEST_EQUALS(actor1Frame, Vector4(0.0f, 0.0f, ITEM_SIZE.width * 2, ITEM_SIZE.height), TEST_LOCATION); END_TEST; } @@ -719,7 +718,7 @@ int UtcDaliToolkitFlexNodeFlexBasisShrinkGrow(void) ToolkitTestApplication application; tet_infoline("UtcDaliToolkitFlexNodeFlexBasisShrinkGrow"); Flex::Node* flexNode = new Flex::Node(); - DALI_TEST_CHECK( flexNode ); + DALI_TEST_CHECK(flexNode); // Position elements as a Row flexNode->SetFlexDirection(Flex::FlexDirection::ROW); @@ -728,13 +727,13 @@ int UtcDaliToolkitFlexNodeFlexBasisShrinkGrow(void) Actor actor1 = Actor::New(); Actor actor2 = Actor::New(); Actor actor3 = Actor::New(); - DALI_TEST_CHECK( actor1 ); - DALI_TEST_CHECK( actor2 ); - DALI_TEST_CHECK( actor3 ); + DALI_TEST_CHECK(actor1); + DALI_TEST_CHECK(actor2); + DALI_TEST_CHECK(actor3); - Flex::Node* actor1node = flexNode->AddChild(actor1, Extents(0,0,0,0), &MeasureChild, 0); - Flex::Node* actor2node = flexNode->AddChild(actor2, Extents(0,0,0,0), &MeasureChild, 1); - Flex::Node* actor3node = flexNode->AddChild(actor3, Extents(0,0,0,0), &MeasureChild, 2); + Flex::Node* actor1node = flexNode->AddChild(actor1, Extents(0, 0, 0, 0), &MeasureChild, 0); + Flex::Node* actor2node = flexNode->AddChild(actor2, Extents(0, 0, 0, 0), &MeasureChild, 1); + Flex::Node* actor3node = flexNode->AddChild(actor3, Extents(0, 0, 0, 0), &MeasureChild, 2); float basis = 5; @@ -748,16 +747,16 @@ int UtcDaliToolkitFlexNodeFlexBasisShrinkGrow(void) actor2node->SetFlexBasis(basis); actor3node->SetFlexBasis(basis); - DALI_TEST_EQUALS( actor1node->GetFlexGrow(), 0.0f, TEST_LOCATION ); - DALI_TEST_EQUALS( actor1node->GetFlexShrink(), 1.0f, TEST_LOCATION ); - DALI_TEST_EQUALS( actor1node->GetFlexBasis(), basis, TEST_LOCATION ); + DALI_TEST_EQUALS(actor1node->GetFlexGrow(), 0.0f, TEST_LOCATION); + DALI_TEST_EQUALS(actor1node->GetFlexShrink(), 1.0f, TEST_LOCATION); + DALI_TEST_EQUALS(actor1node->GetFlexBasis(), basis, TEST_LOCATION); flexNode->CalculateLayout(600, 200, false); - Vector4 root = flexNode->GetNodeFrame(-1); // -1 is the root - Vector4 actor1Frame = flexNode->GetNodeFrame(0); // 0 is first child - Vector4 actor2Frame = flexNode->GetNodeFrame(1); // 1 is second child - Vector4 actor3Frame = flexNode->GetNodeFrame(2); // 2 is third child + Vector4 root = flexNode->GetNodeFrame(-1); // -1 is the root + Vector4 actor1Frame = flexNode->GetNodeFrame(0); // 0 is first child + Vector4 actor2Frame = flexNode->GetNodeFrame(1); // 1 is second child + Vector4 actor3Frame = flexNode->GetNodeFrame(2); // 2 is third child tet_printf("Root frame(left:%f,top:%f,right:%f,bottom:%f)\n", root.x, root.y, root.z, root.w); @@ -772,10 +771,9 @@ int UtcDaliToolkitFlexNodeFlexBasisShrinkGrow(void) ------------------- */ - DALI_TEST_EQUALS( actor1Frame, Vector4( 0.0f, 0.0f, basis, ITEM_SIZE.height ), TEST_LOCATION ); - DALI_TEST_EQUALS( actor2Frame, Vector4( basis, 0.0f, basis*2, ITEM_SIZE.height ), TEST_LOCATION ); - DALI_TEST_EQUALS( actor3Frame, Vector4( basis*2, 0.0f, basis*3, ITEM_SIZE.height ), TEST_LOCATION ); - + DALI_TEST_EQUALS(actor1Frame, Vector4(0.0f, 0.0f, basis, ITEM_SIZE.height), TEST_LOCATION); + DALI_TEST_EQUALS(actor2Frame, Vector4(basis, 0.0f, basis * 2, ITEM_SIZE.height), TEST_LOCATION); + DALI_TEST_EQUALS(actor3Frame, Vector4(basis * 2, 0.0f, basis * 3, ITEM_SIZE.height), TEST_LOCATION); actor2node->SetFlexGrow(1.0); actor3node->SetFlexGrow(1.0); @@ -783,10 +781,10 @@ int UtcDaliToolkitFlexNodeFlexBasisShrinkGrow(void) // Recalulate layout flexNode->CalculateLayout(605, 200, false); - root = flexNode->GetNodeFrame(-1); // -1 is the root - actor1Frame = flexNode->GetNodeFrame(0); // 0 is first child - actor2Frame = flexNode->GetNodeFrame(1); // 1 is second child - actor3Frame = flexNode->GetNodeFrame(2); // 2 is third child + root = flexNode->GetNodeFrame(-1); // -1 is the root + actor1Frame = flexNode->GetNodeFrame(0); // 0 is first child + actor2Frame = flexNode->GetNodeFrame(1); // 1 is second child + actor3Frame = flexNode->GetNodeFrame(2); // 2 is third child tet_printf("Root frame(left:%f,top:%f,right:%f,bottom:%f)\n", root.x, root.y, root.z, root.w); @@ -801,9 +799,9 @@ int UtcDaliToolkitFlexNodeFlexBasisShrinkGrow(void) ------------------- */ - DALI_TEST_EQUALS( actor1Frame, Vector4( 0.0f, 0.0f, basis, ITEM_SIZE.height ), TEST_LOCATION ); - DALI_TEST_EQUALS( actor2Frame, Vector4( basis, 0.0f, basis + (root.z-basis)/2, ITEM_SIZE.height ), TEST_LOCATION ); - DALI_TEST_EQUALS( actor3Frame, Vector4( basis + (root.z-basis)/2, 0.0f, root.z, ITEM_SIZE.height ), TEST_LOCATION ); + DALI_TEST_EQUALS(actor1Frame, Vector4(0.0f, 0.0f, basis, ITEM_SIZE.height), TEST_LOCATION); + DALI_TEST_EQUALS(actor2Frame, Vector4(basis, 0.0f, basis + (root.z - basis) / 2, ITEM_SIZE.height), TEST_LOCATION); + DALI_TEST_EQUALS(actor3Frame, Vector4(basis + (root.z - basis) / 2, 0.0f, root.z, ITEM_SIZE.height), TEST_LOCATION); END_TEST; }