From f0110689a60f896258e88ea2bb12b10a6d629ffd Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Thu, 3 Jan 2019 11:07:24 +0000 Subject: [PATCH] (Automated Tests) Ensure we pick up the correct font in the tests Change-Id: Iab173d2d1aac82decba53ebc61a7bed33ced85bd --- automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp b/automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp index a88c763..301685b 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-Visual.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -276,7 +276,7 @@ int UtcDaliVisualSetGetDepthIndex(void) int UtcDaliVisualSize(void) { ToolkitTestApplication application; - tet_infoline( "UtcDaliVisualGetNaturalSize" ); + tet_infoline( "UtcDaliVisualSize" ); VisualFactory factory = VisualFactory::Get(); Vector2 controlSize( 20.f, 30.f ); @@ -373,15 +373,15 @@ int UtcDaliVisualSize(void) propertyMap.Clear(); propertyMap.Insert( Toolkit::Visual::Property::TYPE, Visual::TEXT ); propertyMap.Insert( TextVisual::Property::ENABLE_MARKUP, true ); - propertyMap.Insert( TextVisual::Property::TEXT, "Hello world" ); + propertyMap.Insert( TextVisual::Property::TEXT, "Hello world" ); propertyMap.Insert( TextVisual::Property::MULTI_LINE, true ); Visual::Base textVisual = factory.CreateVisual( propertyMap ); textVisual.GetNaturalSize( naturalSize ); - DALI_TEST_EQUALS( naturalSize, Size( 80.f, 20.f ), TEST_LOCATION ); + DALI_TEST_EQUALS( naturalSize, Size( 86.f, 20.f ), TEST_LOCATION ); const float height = textVisual.GetHeightForWidth( 40.f ); - DALI_TEST_EQUALS( height, 40.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION ); + DALI_TEST_EQUALS( height, 57.f, Math::MACHINE_EPSILON_1000, TEST_LOCATION ); //AnimatedImageVisual Visual::Base animatedImageVisual = factory.CreateVisual( TEST_GIF_FILE_NAME, ImageDimensions() ); -- 2.7.4