tasn pushed a commit to branch evas-1.7.
commit 404633d08ae40dbf399ff2313813f727cd5a813a
Author: Tom Hacohen <[email protected]>
Date: Tue Aug 20 11:58:15 2013 +0100
Evas textblock tests: Adjust tests according to descent fix.
---
src/tests/evas_test_textblock.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/tests/evas_test_textblock.c b/src/tests/evas_test_textblock.c
index 4a15d3d..9930cad 100644
--- a/src/tests/evas_test_textblock.c
+++ b/src/tests/evas_test_textblock.c
@@ -1023,7 +1023,7 @@ START_TEST(evas_textblock_items)
buf = "This is an <item absize=93x152 vsize=full></>.";
evas_object_textblock_text_markup_set(tb, buf);
evas_object_textblock_size_formatted_get(tb, &w, &h);
- fail_if((w < 93) || (h != 152));
+ fail_if((w < 93) || (h < 153));
evas_textblock_cursor_pos_set(cur, 11);
evas_textblock_cursor_format_item_geometry_get(cur, NULL, NULL, &w, &h);
fail_if((w != 93) || (h != 152));
@@ -1031,7 +1031,7 @@ START_TEST(evas_textblock_items)
buf = "This is an <item absize=93x152 vsize=ascent></>.";
evas_object_textblock_text_markup_set(tb, buf);
evas_object_textblock_size_formatted_get(tb, &w, &h);
- fail_if((w < 93) || (h <= 152));
+ fail_if((w < 93) || (h <= 153));
evas_textblock_cursor_pos_set(cur, 11);
evas_textblock_cursor_format_item_geometry_get(cur, NULL, NULL, &w, &h);
fail_if((w != 93) || (h != 152));
@@ -1040,7 +1040,7 @@ START_TEST(evas_textblock_items)
buf = "This is an <item size=93x152 vsize=full></>.";
evas_object_textblock_text_markup_set(tb, buf);
evas_object_textblock_size_formatted_get(tb, &w, &h);
- fail_if((w < 93) || (h != 152));
+ fail_if((w < 93) || (h < 153));
evas_textblock_cursor_pos_set(cur, 11);
evas_textblock_cursor_format_item_geometry_get(cur, NULL, NULL, &w, &h);
fail_if((w != 93) || (h != 152));
@@ -1048,7 +1048,7 @@ START_TEST(evas_textblock_items)
buf = "This is an <item size=93x152 vsize=ascent></>.";
evas_object_textblock_text_markup_set(tb, buf);
evas_object_textblock_size_formatted_get(tb, &w, &h);
- fail_if((w < 93) || (h <= 152));
+ fail_if((w < 93) || (h <= 153));
evas_textblock_cursor_pos_set(cur, 11);
evas_textblock_cursor_format_item_geometry_get(cur, NULL, NULL, &w, &h);
fail_if((w != 93) || (h != 152));
@@ -1057,7 +1057,7 @@ START_TEST(evas_textblock_items)
buf = "This is an <item size=93x152 vsize=full></>.";
evas_object_textblock_text_markup_set(tb, buf);
evas_object_textblock_size_formatted_get(tb, &w, &h);
- fail_if((w < (2 * 93)) || (h != (2 * 152)));
+ fail_if((w < (2 * 93)) || (h < (2 * 154)));
evas_textblock_cursor_pos_set(cur, 11);
evas_textblock_cursor_format_item_geometry_get(cur, NULL, NULL, &w, &h);
fail_if((w != (2 * 93)) || (h != (2 * 152)));
@@ -1068,7 +1068,7 @@ START_TEST(evas_textblock_items)
buf = "This is an <item size=93x152 vsize=ascent></>.";
evas_object_textblock_text_markup_set(tb, buf);
evas_object_textblock_size_formatted_get(tb, &w, &h);
- fail_if((w < (2 * 93)) || (h <= (2 * 152)));
+ fail_if((w < (2 * 93)) || (h <= (2 * 154)));
evas_textblock_cursor_pos_set(cur, 11);
evas_textblock_cursor_format_item_geometry_get(cur, NULL, NULL, &w, &h);
fail_if((w != (2 * 93)) || (h != (2 * 152)));
@@ -1080,7 +1080,7 @@ START_TEST(evas_textblock_items)
buf = "This is an <item relsize=93x152 vsize=full></>.";
evas_object_textblock_text_markup_set(tb, buf);
evas_object_textblock_size_formatted_get(tb, &w, &h);
- fail_if((w >= 93) || (h >= 152));
+ fail_if((w >= 93) || (h >= 153));
evas_textblock_cursor_pos_set(cur, 11);
evas_textblock_cursor_format_item_geometry_get(cur, NULL, NULL, &w, &ih);
fail_if((w > 90) || (h != ih));
--
------------------------------------------------------------------------------
Introducing Performance Central, a new site from SourceForge and
AppDynamics. Performance Central is your source for news, insights,
analysis and resources for efficient Application Performance Management.
Visit us today!
http://pubads.g.doubleclick.net/gampad/clk?id=48897511&iu=/4140/ostg.clktrk
