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-FlexLayout.cpp;h=46a7658a5520ebf2242ccc21d0ada250e31f9336;hp=60473643d01d219b9484f318cb63caeda28a34de;hb=267bed869a0b35414526b5c393fc2586603ee173;hpb=59314022f6789147a47a8b098433e211b6185625 diff --git a/automated-tests/src/dali-toolkit/utc-Dali-FlexLayout.cpp b/automated-tests/src/dali-toolkit/utc-Dali-FlexLayout.cpp old mode 100644 new mode 100755 index 6047364..46a7658 --- a/automated-tests/src/dali-toolkit/utc-Dali-FlexLayout.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-FlexLayout.cpp @@ -831,7 +831,7 @@ int UtcDaliLayouting_FlexLayout_WithTextLabel(void) application.Render(); DALI_TEST_EQUALS( controls[0].GetProperty( Actor::Property::POSITION ), Vector3( 0.0f, 0.0f, 0.0f ), 0.0001f, TEST_LOCATION ); - DALI_TEST_EQUALS( controls[0].GetProperty( Actor::Property::SIZE ), Vector3( 54.0f, 64.0f, 0.0f ), 0.0001f, TEST_LOCATION ); + DALI_TEST_EQUALS( controls[0].GetProperty( Actor::Property::SIZE ), Vector3( 52.0f, 64.0f, 0.0f ), 0.0001f, TEST_LOCATION ); // Test flexbox2 is sized to wrap its content DALI_TEST_EQUALS( flexbox1.GetProperty( Actor::Property::POSITION ), Vector3( 0.0f, 0.0f, 0.0f ), 0.0001f, TEST_LOCATION ); @@ -844,7 +844,7 @@ int UtcDaliLayouting_FlexLayout_WithTextLabel(void) application.Render(); DALI_TEST_EQUALS( controls[0].GetProperty( Actor::Property::POSITION ), Vector3( 0.0f, 0.0f, 0.0f ), 0.0001f, TEST_LOCATION ); - DALI_TEST_EQUALS( controls[0].GetProperty( Actor::Property::SIZE ), Vector3( 216.0f, 64.0f, 0.0f ), 0.0001f, TEST_LOCATION ); + DALI_TEST_EQUALS( controls[0].GetProperty( Actor::Property::SIZE ), Vector3( 214.0f, 64.0f, 0.0f ), 0.0001f, TEST_LOCATION ); DALI_TEST_EQUALS( flexbox1.GetProperty( Actor::Property::POSITION ), Vector3( 0.0f, 0.0f, 0.0f ), 0.0001f, TEST_LOCATION ); DALI_TEST_EQUALS( flexbox1.GetProperty( Actor::Property::SIZE ), Vector3( 480.0f, 800.0f, 0.0f ), 0.0001f, TEST_LOCATION );