tasn pushed a commit to branch master.
commit 1e9f121f42689e288a7b27bf6d5b0b8159a5bb15
Author: Tom Hacohen <[email protected]>
Date: Tue Aug 20 11:10:50 2013 +0100
Evas textblock tests: Adjust tests according to descent fix.
---
src/tests/evas/evas_test_textblock.c | 14 +++++++-------
1 file changed, 7 insertions(+), 7 deletions(-)
diff --git a/src/tests/evas/evas_test_textblock.c
b/src/tests/evas/evas_test_textblock.c
index d962390..5dc4d9d 100644
--- a/src/tests/evas/evas_test_textblock.c
+++ b/src/tests/evas/evas_test_textblock.c
@@ -1387,7 +1387,7 @@ START_TEST(evas_textblock_items)
evas_object_textblock_text_markup_set(tb, buf);
evas_object_textblock_size_formatted_get(tb, &w, &h);
_ck_assert_int(w, >=, 93);
- ck_assert_int_eq(h, 152);
+ ck_assert_int_eq(h, 153);
evas_textblock_cursor_pos_set(cur, 11);
evas_textblock_cursor_format_item_geometry_get(cur, NULL, NULL, &w, &h);
ck_assert_int_eq(w, 93);
@@ -1397,7 +1397,7 @@ START_TEST(evas_textblock_items)
evas_object_textblock_text_markup_set(tb, buf);
evas_object_textblock_size_formatted_get(tb, &w, &h);
_ck_assert_int(w, >=, 93);
- _ck_assert_int(h, >, 152);
+ _ck_assert_int(h, >, 153);
evas_textblock_cursor_pos_set(cur, 11);
evas_textblock_cursor_format_item_geometry_get(cur, NULL, NULL, &w, &h);
ck_assert_int_eq(w, 93);
@@ -1408,7 +1408,7 @@ START_TEST(evas_textblock_items)
evas_object_textblock_text_markup_set(tb, buf);
evas_object_textblock_size_formatted_get(tb, &w, &h);
_ck_assert_int(w, >=, 93);
- ck_assert_int_eq(h, 152);
+ ck_assert_int_eq(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));
@@ -1416,7 +1416,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));
@@ -1425,7 +1425,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)));
@@ -1436,7 +1436,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)));
@@ -1448,7 +1448,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 > 108) || (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
