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=d3aba7e2d0d123403f3aeaa80a61280031afd0bd;hp=fc015f1465335cf2b0c3c7c86da05e4669c8aa49;hb=01777a3489f027123010b281e58efbc9f0a93db7;hpb=283c6129b00dfdbc1badbf809b4257784820bb30 diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Alignment.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Alignment.cpp index fc015f1..d3aba7e 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) 2015 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. @@ -24,6 +24,7 @@ #include #include #include +#include #include using namespace Dali; @@ -103,8 +104,8 @@ int UtcDaliAlignmentConstructorRegister(void) { ToolkitTestApplication application; - //Te ensure the object is registered after creation - ObjectRegistry registry = Stage::GetCurrent().GetObjectRegistry(); + //To ensure the object is registered after creation + ObjectRegistry registry = application.GetCore().GetObjectRegistry(); DALI_TEST_CHECK( registry ); gObjectCreatedCallBackCalled = false; @@ -120,110 +121,110 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOffStage(void) { ToolkitTestApplication application; - // Default, HorizontalCenter, VerticalCenter - Ensure they do not change! + // Default, HORIZONTAL_CENTER, VERTICAL_CENTER - Ensure they do not change! { Alignment alignment = Alignment::New(); // Check default values - DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION); - Alignment::Type type(Alignment::Type(Alignment::HorizontalCenter | Alignment::VerticalCenter)); + Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER)); alignment.SetAlignmentType(type); DALI_TEST_CHECK(alignment.GetAlignmentType() & type); } - // HorizontalLeft, VerticalCenter + // HORIZONTAL_LEFT, VERTICAL_CENTER { Alignment alignment = Alignment::New(); // Check default values - DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION); - Alignment::Type type(Alignment::HorizontalLeft); + Alignment::Type type(Alignment::HORIZONTAL_LEFT); alignment.SetAlignmentType(type); DALI_TEST_CHECK(alignment.GetAlignmentType() & type); } - // HorizontalRight, VerticalCenter + // HORIZONTAL_RIGHT, VERTICAL_CENTER { Alignment alignment = Alignment::New(); // Check default values - DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION); - Alignment::Type type(Alignment::HorizontalRight); + Alignment::Type type(Alignment::HORIZONTAL_RIGHT); alignment.SetAlignmentType(type); DALI_TEST_CHECK(alignment.GetAlignmentType() & type); } - // HorizontalLeft, VerticalTop + // HORIZONTAL_LEFT, VERTICAL_TOP { Alignment alignment = Alignment::New(); // Check default values - DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION); - Alignment::Type type(Alignment::Type(Alignment::HorizontalLeft | Alignment::VerticalTop)); + Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_LEFT | Alignment::VERTICAL_TOP)); alignment.SetAlignmentType(type); DALI_TEST_CHECK(alignment.GetAlignmentType() & type); } - // HorizontalCenter, VerticalTop + // HORIZONTAL_CENTER, VERTICAL_TOP { Alignment alignment = Alignment::New(); // Check default values - DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION); - Alignment::Type type(Alignment::VerticalTop); + Alignment::Type type(Alignment::VERTICAL_TOP); alignment.SetAlignmentType(type); DALI_TEST_CHECK(alignment.GetAlignmentType() & type); } - // HorizontalRight, VerticalTop + // HORIZONTAL_RIGHT, VERTICAL_TOP { Alignment alignment = Alignment::New(); // Check default values - DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION); - Alignment::Type type(Alignment::Type(Alignment::HorizontalRight | Alignment::VerticalTop)); + Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_RIGHT | Alignment::VERTICAL_TOP)); alignment.SetAlignmentType(type); DALI_TEST_CHECK(alignment.GetAlignmentType() & type); } - // HorizontalLeft, VerticalBottom + // HORIZONTAL_LEFT, VERTICAL_BOTTOM { Alignment alignment = Alignment::New(); // Check default values - DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION); - Alignment::Type type(Alignment::Type(Alignment::HorizontalLeft | Alignment::VerticalBottom)); + Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_LEFT | Alignment::VERTICAL_BOTTOM)); alignment.SetAlignmentType(type); DALI_TEST_CHECK(alignment.GetAlignmentType() & type); } - // HorizontalCenter, VerticalBottom + // HORIZONTAL_CENTER, VERTICAL_BOTTOM { Alignment alignment = Alignment::New(); // Check default values - DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION); - Alignment::Type type(Alignment::VerticalBottom); + Alignment::Type type(Alignment::VERTICAL_BOTTOM); alignment.SetAlignmentType(type); DALI_TEST_CHECK(alignment.GetAlignmentType() & type); } - // HorizontalRight, VerticalBottom + // HORIZONTAL_RIGHT, VERTICAL_BOTTOM { Alignment alignment = Alignment::New(); // Check default values - DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION); - Alignment::Type type(Alignment::Type(Alignment::HorizontalRight | Alignment::VerticalBottom)); + Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_RIGHT | Alignment::VERTICAL_BOTTOM)); alignment.SetAlignmentType(type); DALI_TEST_CHECK(alignment.GetAlignmentType() & type); } @@ -234,182 +235,182 @@ int UtcDaliAlignmentSetAlignmentTypePositiveOnStage(void) { ToolkitTestApplication application; - // Default, HorizontalCenter, VerticalCenter - Ensure they do not change! + // Default, HORIZONTAL_CENTER, VERTICAL_CENTER - Ensure they do not change! { Alignment alignment = Alignment::New(); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); // Check default values - DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION); - Alignment::Type type(Alignment::Type(Alignment::HorizontalCenter | Alignment::VerticalCenter)); + Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER)); alignment.SetAlignmentType(type); DALI_TEST_CHECK(alignment.GetAlignmentType() & type); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } - // HorizontalLeft, VerticalCenter + // HORIZONTAL_LEFT, VERTICAL_CENTER { Alignment alignment = Alignment::New(); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); // Check default values - DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION); - Alignment::Type type(Alignment::HorizontalLeft); + Alignment::Type type(Alignment::HORIZONTAL_LEFT); alignment.SetAlignmentType(type); DALI_TEST_CHECK(alignment.GetAlignmentType() & type); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } - // HorizontalRight, VerticalCenter + // HORIZONTAL_RIGHT, VERTICAL_CENTER { Alignment alignment = Alignment::New(); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); // Check default values - DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION); - Alignment::Type type(Alignment::HorizontalRight); + Alignment::Type type(Alignment::HORIZONTAL_RIGHT); alignment.SetAlignmentType(type); DALI_TEST_CHECK(alignment.GetAlignmentType() & type); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } - // HorizontalLeft, VerticalTop + // HORIZONTAL_LEFT, VERTICAL_TOP { Alignment alignment = Alignment::New(); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); // Check default values - DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION); - Alignment::Type type(Alignment::Type(Alignment::HorizontalLeft | Alignment::VerticalTop)); + Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_LEFT | Alignment::VERTICAL_TOP)); alignment.SetAlignmentType(type); DALI_TEST_CHECK(alignment.GetAlignmentType() & type); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } - // HorizontalCenter, VerticalTop + // HORIZONTAL_CENTER, VERTICAL_TOP { Alignment alignment = Alignment::New(); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); // Check default values - DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION); - Alignment::Type type(Alignment::VerticalTop); + Alignment::Type type(Alignment::VERTICAL_TOP); alignment.SetAlignmentType(type); DALI_TEST_CHECK(alignment.GetAlignmentType() & type); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } - // HorizontalRight, VerticalTop + // HORIZONTAL_RIGHT, VERTICAL_TOP { Alignment alignment = Alignment::New(); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); // Check default values - DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION); - Alignment::Type type(Alignment::Type(Alignment::HorizontalRight | Alignment::VerticalTop)); + Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_RIGHT | Alignment::VERTICAL_TOP)); alignment.SetAlignmentType(type); DALI_TEST_CHECK(alignment.GetAlignmentType() & type); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } - // HorizontalLeft, VerticalBottom + // HORIZONTAL_LEFT, VERTICAL_BOTTOM { Alignment alignment = Alignment::New(); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); // Check default values - DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION); - Alignment::Type type(Alignment::Type(Alignment::HorizontalLeft | Alignment::VerticalBottom)); + Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_LEFT | Alignment::VERTICAL_BOTTOM)); alignment.SetAlignmentType(type); DALI_TEST_CHECK(alignment.GetAlignmentType() & type); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } - // HorizontalCenter, VerticalBottom + // HORIZONTAL_CENTER, VERTICAL_BOTTOM { Alignment alignment = Alignment::New(); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); // Check default values - DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION); - Alignment::Type type(Alignment::VerticalBottom); + Alignment::Type type(Alignment::VERTICAL_BOTTOM); alignment.SetAlignmentType(type); DALI_TEST_CHECK(alignment.GetAlignmentType() & type); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } - // HorizontalRight, VerticalBottom + // HORIZONTAL_RIGHT, VERTICAL_BOTTOM { Alignment alignment = Alignment::New(); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); // Check default values - DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION); - Alignment::Type type(Alignment::Type(Alignment::HorizontalRight | Alignment::VerticalBottom)); + Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_RIGHT | Alignment::VERTICAL_BOTTOM)); alignment.SetAlignmentType(type); DALI_TEST_CHECK(alignment.GetAlignmentType() & type); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } @@ -420,45 +421,45 @@ int UtcDaliAlignmentSetAlignmentTypeNegative(void) { ToolkitTestApplication application; - // Setting HorizontalLeft, HorizontalCenter + // Setting HORIZONTAL_LEFT, HORIZONTAL_CENTER { Alignment alignment = Alignment::New(); - Alignment::Type type(Alignment::Type(Alignment::HorizontalLeft | Alignment::HorizontalCenter)); + Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_LEFT | Alignment::HORIZONTAL_CENTER)); alignment.SetAlignmentType(type); // center will prevail in conflict - DALI_TEST_CHECK( Alignment::HorizontalCenter & alignment.GetAlignmentType() ); - DALI_TEST_CHECK( !(Alignment::HorizontalLeft & alignment.GetAlignmentType()) ); + DALI_TEST_CHECK( Alignment::HORIZONTAL_CENTER & alignment.GetAlignmentType() ); + DALI_TEST_CHECK( !(Alignment::HORIZONTAL_LEFT & alignment.GetAlignmentType()) ); } - // Setting HorizontalCenter, HorizontalRight + // Setting HORIZONTAL_CENTER, HORIZONTAL_RIGHT { Alignment alignment = Alignment::New(); - Alignment::Type type(Alignment::Type(Alignment::HorizontalCenter | Alignment::HorizontalRight)); + Alignment::Type type(Alignment::Type(Alignment::HORIZONTAL_CENTER | Alignment::HORIZONTAL_RIGHT)); alignment.SetAlignmentType(type); // center will prevail in conflict - DALI_TEST_CHECK( Alignment::HorizontalCenter & alignment.GetAlignmentType() ); - DALI_TEST_CHECK( !(Alignment::HorizontalRight & alignment.GetAlignmentType()) ); + DALI_TEST_CHECK( Alignment::HORIZONTAL_CENTER & alignment.GetAlignmentType() ); + DALI_TEST_CHECK( !(Alignment::HORIZONTAL_RIGHT & alignment.GetAlignmentType()) ); } - // Setting VerticalTop, VerticalCenter + // Setting VERTICAL_TOP, VERTICAL_CENTER { Alignment alignment = Alignment::New(); - Alignment::Type type(Alignment::Type(Alignment::VerticalTop | Alignment::VerticalCenter)); + Alignment::Type type(Alignment::Type(Alignment::VERTICAL_TOP | Alignment::VERTICAL_CENTER)); alignment.SetAlignmentType(type); // center will prevail in conflict - DALI_TEST_CHECK( Alignment::VerticalCenter & alignment.GetAlignmentType() ); - DALI_TEST_CHECK( !(Alignment::VerticalTop & alignment.GetAlignmentType()) ); + DALI_TEST_CHECK( Alignment::VERTICAL_CENTER & alignment.GetAlignmentType() ); + DALI_TEST_CHECK( !(Alignment::VERTICAL_TOP & alignment.GetAlignmentType()) ); } - // Setting VerticalCenter, VerticalBottom + // Setting VERTICAL_CENTER, VERTICAL_BOTTOM { Alignment alignment = Alignment::New(); - Alignment::Type type(Alignment::Type(Alignment::VerticalTop | Alignment::VerticalBottom)); + Alignment::Type type(Alignment::Type(Alignment::VERTICAL_TOP | Alignment::VERTICAL_BOTTOM)); alignment.SetAlignmentType(type); // top will prevail in conflict - DALI_TEST_CHECK( Alignment::VerticalTop & alignment.GetAlignmentType() ); - DALI_TEST_CHECK( !(Alignment::VerticalBottom & alignment.GetAlignmentType()) ); + DALI_TEST_CHECK( Alignment::VERTICAL_TOP & alignment.GetAlignmentType() ); + DALI_TEST_CHECK( !(Alignment::VERTICAL_BOTTOM & alignment.GetAlignmentType()) ); } END_TEST; } @@ -467,119 +468,119 @@ int UtcDaliAlignmentGetAlignmentType(void) { ToolkitTestApplication application; - // Default, HorizonalCenter, VerticalCenter + // Default, HorizonalCenter, VERTICAL_CENTER { Alignment alignment = Alignment::New(); - DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } - // HorizontalLeft, VerticalCenter + // HORIZONTAL_LEFT, VERTICAL_CENTER { - Alignment alignment = Alignment::New(Alignment::HorizontalLeft); - DALI_TEST_EQUALS(Alignment::HorizontalLeft | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); + Alignment alignment = Alignment::New(Alignment::HORIZONTAL_LEFT); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_LEFT | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } - // HorizontalRight, VerticalCenter + // HORIZONTAL_RIGHT, VERTICAL_CENTER { - Alignment alignment = Alignment::New(Alignment::HorizontalRight); - DALI_TEST_EQUALS(Alignment::HorizontalRight | Alignment::VerticalCenter, alignment.GetAlignmentType(), TEST_LOCATION); + Alignment alignment = Alignment::New(Alignment::HORIZONTAL_RIGHT); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_RIGHT | Alignment::VERTICAL_CENTER, alignment.GetAlignmentType(), TEST_LOCATION); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } - // HorizontalLeft, VerticalTop + // HORIZONTAL_LEFT, VERTICAL_TOP { - Alignment alignment = Alignment::New(Alignment::HorizontalLeft, Alignment::VerticalTop); - DALI_TEST_EQUALS(Alignment::HorizontalLeft | Alignment::VerticalTop, alignment.GetAlignmentType(), TEST_LOCATION); + Alignment alignment = Alignment::New(Alignment::HORIZONTAL_LEFT, Alignment::VERTICAL_TOP); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_LEFT | Alignment::VERTICAL_TOP, alignment.GetAlignmentType(), TEST_LOCATION); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } - // HorizontalCenter, VerticalTop + // HORIZONTAL_CENTER, VERTICAL_TOP { - Alignment alignment = Alignment::New(Alignment::HorizontalCenter, Alignment::VerticalTop); - DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalTop, alignment.GetAlignmentType(), TEST_LOCATION); + Alignment alignment = Alignment::New(Alignment::HORIZONTAL_CENTER, Alignment::VERTICAL_TOP); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_TOP, alignment.GetAlignmentType(), TEST_LOCATION); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } - // HorizontalRight, VerticalTop + // HORIZONTAL_RIGHT, VERTICAL_TOP { - Alignment alignment = Alignment::New(Alignment::HorizontalRight, Alignment::VerticalTop); - DALI_TEST_EQUALS(Alignment::HorizontalRight | Alignment::VerticalTop, alignment.GetAlignmentType(), TEST_LOCATION); + Alignment alignment = Alignment::New(Alignment::HORIZONTAL_RIGHT, Alignment::VERTICAL_TOP); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_RIGHT | Alignment::VERTICAL_TOP, alignment.GetAlignmentType(), TEST_LOCATION); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } - // HorizontalLeft, VerticalBottom + // HORIZONTAL_LEFT, VERTICAL_BOTTOM { - Alignment alignment = Alignment::New(Alignment::HorizontalLeft, Alignment::VerticalBottom); - DALI_TEST_EQUALS(Alignment::HorizontalLeft | Alignment::VerticalBottom, alignment.GetAlignmentType(), TEST_LOCATION); + Alignment alignment = Alignment::New(Alignment::HORIZONTAL_LEFT, Alignment::VERTICAL_BOTTOM); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_LEFT | Alignment::VERTICAL_BOTTOM, alignment.GetAlignmentType(), TEST_LOCATION); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } - // HorizontalCenter, VerticalBottom + // HORIZONTAL_CENTER, VERTICAL_BOTTOM { - Alignment alignment = Alignment::New(Alignment::HorizontalCenter, Alignment::VerticalBottom); - DALI_TEST_EQUALS(Alignment::HorizontalCenter | Alignment::VerticalBottom, alignment.GetAlignmentType(), TEST_LOCATION); + Alignment alignment = Alignment::New(Alignment::HORIZONTAL_CENTER, Alignment::VERTICAL_BOTTOM); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_CENTER | Alignment::VERTICAL_BOTTOM, alignment.GetAlignmentType(), TEST_LOCATION); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } - // HorizontalRight, VerticalBottom + // HORIZONTAL_RIGHT, VERTICAL_BOTTOM { - Alignment alignment = Alignment::New(Alignment::HorizontalRight, Alignment::VerticalBottom); - DALI_TEST_EQUALS(Alignment::HorizontalRight | Alignment::VerticalBottom, alignment.GetAlignmentType(), TEST_LOCATION); + Alignment alignment = Alignment::New(Alignment::HORIZONTAL_RIGHT, Alignment::VERTICAL_BOTTOM); + DALI_TEST_EQUALS(Alignment::HORIZONTAL_RIGHT | Alignment::VERTICAL_BOTTOM, alignment.GetAlignmentType(), TEST_LOCATION); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } @@ -590,167 +591,167 @@ int UtcDaliAlignmentSetScaling(void) { ToolkitTestApplication application; - // ScaleToFill + // SCALE_TO_FILL { Alignment alignment = Alignment::New(); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); - DALI_TEST_EQUALS(Alignment::ScaleNone, alignment.GetScaling(), TEST_LOCATION); - alignment.SetScaling(Alignment::ScaleToFill); - DALI_TEST_EQUALS(Alignment::ScaleToFill, alignment.GetScaling(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::SCALE_NONE, alignment.GetScaling(), TEST_LOCATION); + alignment.SetScaling(Alignment::SCALE_TO_FILL); + DALI_TEST_EQUALS(Alignment::SCALE_TO_FILL, alignment.GetScaling(), TEST_LOCATION); application.Render(); application.SendNotification(); // For complete line coverage - alignment.SetAlignmentType(Alignment::HorizontalLeft); + alignment.SetAlignmentType(Alignment::HORIZONTAL_LEFT); application.Render(); application.SendNotification(); - alignment.SetAlignmentType(Alignment::HorizontalRight); + alignment.SetAlignmentType(Alignment::HORIZONTAL_RIGHT); application.Render(); application.SendNotification(); - alignment.SetAlignmentType(Alignment::VerticalTop); + alignment.SetAlignmentType(Alignment::VERTICAL_TOP); application.Render(); application.SendNotification(); - alignment.SetAlignmentType(Alignment::VerticalBottom); + alignment.SetAlignmentType(Alignment::VERTICAL_BOTTOM); application.Render(); application.SendNotification(); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } - // ScaleToFitKeepAspect + // SCALE_TO_FIT_KEEP_ASPECT { Alignment alignment = Alignment::New(); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); - DALI_TEST_EQUALS(Alignment::ScaleNone, alignment.GetScaling(), TEST_LOCATION); - alignment.SetScaling(Alignment::ScaleToFitKeepAspect); - DALI_TEST_EQUALS(Alignment::ScaleToFitKeepAspect, alignment.GetScaling(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::SCALE_NONE, alignment.GetScaling(), TEST_LOCATION); + alignment.SetScaling(Alignment::SCALE_TO_FIT_KEEP_ASPECT); + DALI_TEST_EQUALS(Alignment::SCALE_TO_FIT_KEEP_ASPECT, alignment.GetScaling(), TEST_LOCATION); application.Render(); application.SendNotification(); // For complete line coverage - alignment.SetAlignmentType(Alignment::HorizontalLeft); + alignment.SetAlignmentType(Alignment::HORIZONTAL_LEFT); application.Render(); application.SendNotification(); - alignment.SetAlignmentType(Alignment::HorizontalRight); + alignment.SetAlignmentType(Alignment::HORIZONTAL_RIGHT); application.Render(); application.SendNotification(); - alignment.SetAlignmentType(Alignment::VerticalTop); + alignment.SetAlignmentType(Alignment::VERTICAL_TOP); application.Render(); application.SendNotification(); - alignment.SetAlignmentType(Alignment::VerticalBottom); + alignment.SetAlignmentType(Alignment::VERTICAL_BOTTOM); application.Render(); application.SendNotification(); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } - // ScaleToFillKeepAspect + // SCALE_TO_FILL_KEEP_ASPECT { Alignment alignment = Alignment::New(); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); - DALI_TEST_EQUALS(Alignment::ScaleNone, alignment.GetScaling(), TEST_LOCATION); - alignment.SetScaling(Alignment::ScaleToFillKeepAspect); - DALI_TEST_EQUALS(Alignment::ScaleToFillKeepAspect, alignment.GetScaling(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::SCALE_NONE, alignment.GetScaling(), TEST_LOCATION); + alignment.SetScaling(Alignment::SCALE_TO_FILL_KEEP_ASPECT); + DALI_TEST_EQUALS(Alignment::SCALE_TO_FILL_KEEP_ASPECT, alignment.GetScaling(), TEST_LOCATION); application.Render(); application.SendNotification(); // For complete line coverage - alignment.SetAlignmentType(Alignment::HorizontalLeft); + alignment.SetAlignmentType(Alignment::HORIZONTAL_LEFT); application.Render(); application.SendNotification(); - alignment.SetAlignmentType(Alignment::HorizontalRight); + alignment.SetAlignmentType(Alignment::HORIZONTAL_RIGHT); application.Render(); application.SendNotification(); - alignment.SetAlignmentType(Alignment::VerticalTop); + alignment.SetAlignmentType(Alignment::VERTICAL_TOP); application.Render(); application.SendNotification(); - alignment.SetAlignmentType(Alignment::VerticalBottom); + alignment.SetAlignmentType(Alignment::VERTICAL_BOTTOM); application.Render(); application.SendNotification(); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } - // ShrinkToFit + // SHRINK_TO_FIT { Alignment alignment = Alignment::New(); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); - DALI_TEST_EQUALS(Alignment::ScaleNone, alignment.GetScaling(), TEST_LOCATION); - alignment.SetScaling(Alignment::ShrinkToFit); - DALI_TEST_EQUALS(Alignment::ShrinkToFit, alignment.GetScaling(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::SCALE_NONE, alignment.GetScaling(), TEST_LOCATION); + alignment.SetScaling(Alignment::SHRINK_TO_FIT); + DALI_TEST_EQUALS(Alignment::SHRINK_TO_FIT, alignment.GetScaling(), TEST_LOCATION); application.Render(); application.SendNotification(); // For complete line coverage - alignment.SetAlignmentType(Alignment::HorizontalLeft); + alignment.SetAlignmentType(Alignment::HORIZONTAL_LEFT); application.Render(); application.SendNotification(); - alignment.SetAlignmentType(Alignment::HorizontalRight); + alignment.SetAlignmentType(Alignment::HORIZONTAL_RIGHT); application.Render(); application.SendNotification(); - alignment.SetAlignmentType(Alignment::VerticalTop); + alignment.SetAlignmentType(Alignment::VERTICAL_TOP); application.Render(); application.SendNotification(); - alignment.SetAlignmentType(Alignment::VerticalBottom); + alignment.SetAlignmentType(Alignment::VERTICAL_BOTTOM); application.Render(); application.SendNotification(); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } - // ShrinkToFitKeepAspect + // SHRINK_TO_FIT_KEEP_ASPECT { Alignment alignment = Alignment::New(); alignment.Add(Actor::New()); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); - DALI_TEST_EQUALS(Alignment::ScaleNone, alignment.GetScaling(), TEST_LOCATION); - alignment.SetScaling(Alignment::ShrinkToFitKeepAspect); - DALI_TEST_EQUALS(Alignment::ShrinkToFitKeepAspect, alignment.GetScaling(), TEST_LOCATION); + DALI_TEST_EQUALS(Alignment::SCALE_NONE, alignment.GetScaling(), TEST_LOCATION); + alignment.SetScaling(Alignment::SHRINK_TO_FIT_KEEP_ASPECT); + DALI_TEST_EQUALS(Alignment::SHRINK_TO_FIT_KEEP_ASPECT, alignment.GetScaling(), TEST_LOCATION); application.Render(); application.SendNotification(); // For complete line coverage - alignment.SetAlignmentType(Alignment::HorizontalLeft); + alignment.SetAlignmentType(Alignment::HORIZONTAL_LEFT); application.Render(); application.SendNotification(); - alignment.SetAlignmentType(Alignment::HorizontalRight); + alignment.SetAlignmentType(Alignment::HORIZONTAL_RIGHT); application.Render(); application.SendNotification(); - alignment.SetAlignmentType(Alignment::VerticalTop); + alignment.SetAlignmentType(Alignment::VERTICAL_TOP); application.Render(); application.SendNotification(); - alignment.SetAlignmentType(Alignment::VerticalBottom); + alignment.SetAlignmentType(Alignment::VERTICAL_BOTTOM); application.Render(); application.SendNotification(); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); application.Render(); application.SendNotification(); } @@ -761,49 +762,49 @@ int UtcDaliAlignmentGetScaling(void) { ToolkitTestApplication application; - // ScaleToFill + // SCALE_TO_FILL { Alignment alignment = Alignment::New(); - DALI_TEST_CHECK(alignment.GetScaling() == Alignment::ScaleNone); + DALI_TEST_CHECK(alignment.GetScaling() == Alignment::SCALE_NONE); - alignment.SetScaling(Alignment::ScaleToFill); - DALI_TEST_CHECK(alignment.GetScaling() == Alignment::ScaleToFill); + alignment.SetScaling(Alignment::SCALE_TO_FILL); + DALI_TEST_CHECK(alignment.GetScaling() == Alignment::SCALE_TO_FILL); } - // ScaleToFitKeepAspect + // SCALE_TO_FIT_KEEP_ASPECT { Alignment alignment = Alignment::New(); - DALI_TEST_CHECK(alignment.GetScaling() == Alignment::ScaleNone); + DALI_TEST_CHECK(alignment.GetScaling() == Alignment::SCALE_NONE); - alignment.SetScaling(Alignment::ScaleToFitKeepAspect); - DALI_TEST_CHECK(alignment.GetScaling() == Alignment::ScaleToFitKeepAspect); + alignment.SetScaling(Alignment::SCALE_TO_FIT_KEEP_ASPECT); + DALI_TEST_CHECK(alignment.GetScaling() == Alignment::SCALE_TO_FIT_KEEP_ASPECT); } - // ScaleToFillKeepAspect + // SCALE_TO_FILL_KEEP_ASPECT { Alignment alignment = Alignment::New(); - DALI_TEST_CHECK(alignment.GetScaling() == Alignment::ScaleNone); + DALI_TEST_CHECK(alignment.GetScaling() == Alignment::SCALE_NONE); - alignment.SetScaling(Alignment::ScaleToFillKeepAspect); - DALI_TEST_CHECK(alignment.GetScaling() == Alignment::ScaleToFillKeepAspect); + alignment.SetScaling(Alignment::SCALE_TO_FILL_KEEP_ASPECT); + DALI_TEST_CHECK(alignment.GetScaling() == Alignment::SCALE_TO_FILL_KEEP_ASPECT); } - // ShrinkToFit + // SHRINK_TO_FIT { Alignment alignment = Alignment::New(); - DALI_TEST_CHECK(alignment.GetScaling() == Alignment::ScaleNone); + DALI_TEST_CHECK(alignment.GetScaling() == Alignment::SCALE_NONE); - alignment.SetScaling(Alignment::ShrinkToFit); - DALI_TEST_CHECK(alignment.GetScaling() == Alignment::ShrinkToFit); + alignment.SetScaling(Alignment::SHRINK_TO_FIT); + DALI_TEST_CHECK(alignment.GetScaling() == Alignment::SHRINK_TO_FIT); } - // ShrinkToFitKeepAspect + // SHRINK_TO_FIT_KEEP_ASPECT { Alignment alignment = Alignment::New(); - DALI_TEST_CHECK(alignment.GetScaling() == Alignment::ScaleNone); + DALI_TEST_CHECK(alignment.GetScaling() == Alignment::SCALE_NONE); - alignment.SetScaling(Alignment::ShrinkToFitKeepAspect); - DALI_TEST_CHECK(alignment.GetScaling() == Alignment::ShrinkToFitKeepAspect); + alignment.SetScaling(Alignment::SHRINK_TO_FIT_KEEP_ASPECT); + DALI_TEST_CHECK(alignment.GetScaling() == Alignment::SHRINK_TO_FIT_KEEP_ASPECT); } END_TEST; @@ -905,7 +906,7 @@ int UtcDaliAlignmentChildAddAndRemove(void) ToolkitTestApplication application; Alignment alignment = Alignment::New(); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); @@ -925,7 +926,7 @@ int UtcDaliAlignmentChildAddAndRemove(void) application.Render(); application.SendNotification(); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); END_TEST; } @@ -934,13 +935,13 @@ int UtcDaliAlignmentSizeSetP(void) ToolkitTestApplication application; Alignment alignment = Alignment::New(); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); application.Render(); application.SendNotification(); Vector2 size( 100.0f, 200.0f ); - alignment.SetSize(size); + alignment.SetProperty( Actor::Property::SIZE, size); application.Render(); application.SendNotification(); @@ -949,12 +950,12 @@ int UtcDaliAlignmentSizeSetP(void) DALI_TEST_EQUALS(size, alignment.GetTargetSize().GetVectorXY(), TEST_LOCATION); - Stage::GetCurrent().Remove(alignment); + application.GetScene().Remove(alignment); END_TEST; } /////////////////////////////////////////////////////////////////////////////// -static bool TouchCallback(Actor actor, const TouchData& event) +static bool TouchCallback(Actor actor, const TouchEvent& event) { return false; } @@ -966,11 +967,11 @@ int UtcDaliAlignmentOnTouchEvent(void) ToolkitTestApplication application; Alignment alignment = Alignment::New(); - alignment.SetSize(100.0f, 100.0f); - alignment.SetAnchorPoint(AnchorPoint::TOP_LEFT); - Stage::GetCurrent().Add(alignment); + alignment.SetProperty( Actor::Property::SIZE, Vector2( 100.0f, 100.0f ) ); + alignment.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT); + application.GetScene().Add(alignment); - alignment.TouchSignal().Connect(&TouchCallback); + alignment.TouchedSignal().Connect(&TouchCallback); application.Render(); application.SendNotification(); @@ -994,7 +995,7 @@ int UtcDaliAlignmentOnKeyEvent(void) ToolkitTestApplication application; Alignment alignment = Alignment::New(); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); alignment.SetKeyInputFocus(); @@ -1015,7 +1016,7 @@ int UtcDaliAlignmentOnSizeAnimation(void) ToolkitTestApplication application; Alignment alignment = Alignment::New(); - Stage::GetCurrent().Add(alignment); + application.GetScene().Add(alignment); Animation animation = Animation::New(100.0f); animation.AnimateTo( Property( alignment, Actor::Property::SIZE ), Vector3( 100.0f, 150.0f, 200.0f ) );