X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-ItemLayout.cpp;h=447c78aa250984ece787c04e7cdfdeefb1ad32d6;hb=c38ef089812a54c956c8ae5857c6fe369e1da005;hp=68938b9034ad74cb8ce8bd1d6dcfeb625a500112;hpb=17b0a845048893fb8aadd6841c72ed51a92a90e0;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 68938b9..447c78a 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ItemLayout.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ItemLayout.cpp @@ -72,9 +72,9 @@ public: // From ItemFactory */ virtual Actor NewItem(unsigned int itemId) { - // Create an image actor for this item + // Create a renderable actor for this item Image image = ResourceImage::New( TEST_IMAGE_FILE_NAME ); - Actor actor = ImageActor::New(image); + Actor actor = CreateRenderableActor(image); return actor; } @@ -346,3 +346,24 @@ int UtcDaliItemLayoutGetNextFocusItemID(void) END_TEST; } +int UtcDaliItemRangeIntersection(void) +{ + ToolkitTestApplication application; + + unsigned int uBeginItemFirst = 100u, uEndItemFirst = 300u; + unsigned int uBeginItemSecond = 290u, uEndItemSecond = 400; + unsigned int uInterBeginCheck=290u , uInterEndCheck=301u; + bool bIsInThisRange = false, bOutOfThisRange = false; + + Toolkit::ItemRange objItemRangeFirst(uBeginItemFirst, uEndItemFirst); + Toolkit::ItemRange objItemRangeSecond(uBeginItemSecond, uEndItemSecond); + ItemRange itmInterSect = objItemRangeFirst.Intersection(objItemRangeSecond); + + bIsInThisRange = itmInterSect.Within(uInterBeginCheck); + DALI_TEST_EQUALS(bIsInThisRange, true, TEST_LOCATION ); + + bOutOfThisRange = itmInterSect.Within(uInterEndCheck); + DALI_TEST_EQUALS(bOutOfThisRange, false, TEST_LOCATION ); + + END_TEST; +}