X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-ItemLayout.cpp;h=dea4d521e473b734d9276ab56d034bb77cab0a25;hb=1db0a8becea3dbdebaa942d934d91824a92434e7;hp=b81aa6d2b47f79e4c19ed8a1290295af32298f27;hpb=d5e3ed5f5b1c8fdba3ae97ead8729620f54b3836;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ItemLayout.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ItemLayout.cpp index b81aa6d..dea4d52 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ItemLayout.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ItemLayout.cpp @@ -66,7 +66,7 @@ public: // From ItemFactory virtual Actor NewItem(unsigned int itemId) { // Create an image actor for this item - Image image = Image::New( TEST_IMAGE_FILE_NAME ); + Image image = ResourceImage::New( TEST_IMAGE_FILE_NAME ); Actor actor = ImageActor::New(image); return actor; @@ -94,46 +94,3 @@ int UtcDaliItemLayoutSetAndGetOrientation(void) DALI_TEST_CHECK(layout->GetOrientation() == ControlOrientation::Left); END_TEST; } - -int UtcDaliItemLayoutGetScrollHints(void) -{ - ToolkitTestApplication application; - - // Create the ItemView actor - TestItemFactory factory; - ItemView view = ItemView::New(factory); - - // Create a grid layout and add it to ItemView - GridLayoutPtr gridLayout = GridLayout::New(); - view.AddLayout(*gridLayout); - - // Set the orientation of the layout to be horizontal from left to right - ItemLayoutPtr layout = view.GetLayout(0); - - Vector2 axisScrollHint; - - layout->SetOrientation(ControlOrientation::Up); - layout->GetXAxisScrollHint(axisScrollHint); - DALI_TEST_EQUALS(axisScrollHint, Vector2::ZERO, Math::MACHINE_EPSILON_1, TEST_LOCATION); - layout->GetYAxisScrollHint(axisScrollHint); - DALI_TEST_EQUALS(axisScrollHint, Vector2::YAXIS, Math::MACHINE_EPSILON_1, TEST_LOCATION); - - layout->SetOrientation(ControlOrientation::Down); - layout->GetXAxisScrollHint(axisScrollHint); - DALI_TEST_EQUALS(axisScrollHint, Vector2::ZERO, Math::MACHINE_EPSILON_1, TEST_LOCATION); - layout->GetYAxisScrollHint(axisScrollHint); - DALI_TEST_EQUALS(axisScrollHint, Vector2::YAXIS, Math::MACHINE_EPSILON_1, TEST_LOCATION); - - layout->SetOrientation(ControlOrientation::Left); - layout->GetXAxisScrollHint(axisScrollHint); - DALI_TEST_EQUALS(axisScrollHint, Vector2::XAXIS, Math::MACHINE_EPSILON_1, TEST_LOCATION); - layout->GetYAxisScrollHint(axisScrollHint); - DALI_TEST_EQUALS(axisScrollHint, Vector2::ZERO, Math::MACHINE_EPSILON_1, TEST_LOCATION); - - layout->SetOrientation(ControlOrientation::Right); - layout->GetXAxisScrollHint(axisScrollHint); - DALI_TEST_EQUALS(axisScrollHint, Vector2::XAXIS, Math::MACHINE_EPSILON_1, TEST_LOCATION); - layout->GetYAxisScrollHint(axisScrollHint); - DALI_TEST_EQUALS(axisScrollHint, Vector2::ZERO, Math::MACHINE_EPSILON_1, TEST_LOCATION); - END_TEST; -}