summaryrefslogtreecommitdiff
path: root/src/tests/edje/edje_test_edje.c
diff options
context:
space:
mode:
authorJean-Philippe Andre <jp.andre@samsung.com>2016-04-26 15:21:21 +0900
committerJean-Philippe Andre <jp.andre@samsung.com>2016-04-26 16:48:55 +0900
commitff8ee0143223681cb55ce5386b8fb8f126bf2b90 (patch)
tree2d8e72c1f5a686f915abda6c19c6eb8cf639a6db /src/tests/edje/edje_test_edje.c
parent49dde632bc0c4b98609d85f1f46587b292778b16 (diff)
Efl: Rename some packing functions and return bool
This renames some APIs from Efl.Pack in order to try and make them more sensible. Feedback welcome. Also, most APIs now return bool, where false is quite unlikely to happen.
Diffstat (limited to 'src/tests/edje/edje_test_edje.c')
-rw-r--r--src/tests/edje/edje_test_edje.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/src/tests/edje/edje_test_edje.c b/src/tests/edje/edje_test_edje.c
index 5fd77b86e7..c9b42eb4ee 100644
--- a/src/tests/edje/edje_test_edje.c
+++ b/src/tests/edje/edje_test_edje.c
@@ -521,7 +521,7 @@ START_TEST(edje_test_box_eoapi)
521 efl_pack_begin(box, sobjs[1]); 521 efl_pack_begin(box, sobjs[1]);
522 efl_pack_before(box, sobjs[0], sobjs[1]); 522 efl_pack_before(box, sobjs[0], sobjs[1]);
523 efl_pack_after(box, sobjs[4], sobjs[3]); 523 efl_pack_after(box, sobjs[4], sobjs[3]);
524 efl_pack_insert(box, sobjs[2], 2); 524 efl_pack_at(box, sobjs[2], 2);
525 fail_if(efl_content_count(box) != 5); 525 fail_if(efl_content_count(box) != 5);
526 526
527 it = efl_content_iterate(box); 527 it = efl_content_iterate(box);
@@ -536,8 +536,8 @@ START_TEST(edje_test_box_eoapi)
536 fail_if(efl_content_count(box) != 0); 536 fail_if(efl_content_count(box) != 0);
537 537
538 efl_pack(box, sobjs[1]); 538 efl_pack(box, sobjs[1]);
539 efl_pack_insert(box, sobjs[0], 0); 539 efl_pack_at(box, sobjs[0], 0);
540 efl_pack_insert(box, sobjs[2], -1); 540 efl_pack_at(box, sobjs[2], -1);
541 it = efl_content_iterate(box); 541 it = efl_content_iterate(box);
542 i = 0; 542 i = 0;
543 EINA_ITERATOR_FOREACH(it, sobj) 543 EINA_ITERATOR_FOREACH(it, sobj)
@@ -547,9 +547,9 @@ START_TEST(edje_test_box_eoapi)
547 547
548 fail_if(!efl_content_remove(box, sobjs[0])); 548 fail_if(!efl_content_remove(box, sobjs[0]));
549 fail_if(efl_content_count(box) != 2); 549 fail_if(efl_content_count(box) != 2);
550 fail_if(!efl_pack_content_at_remove(box, 1)); 550 fail_if(!efl_pack_unpack_at(box, 1));
551 fail_if(efl_content_count(box) != 1); 551 fail_if(efl_content_count(box) != 1);
552 fail_if(efl_pack_content_index_get(box, sobjs[1]) != 0); 552 fail_if(efl_pack_index_get(box, sobjs[1]) != 0);
553 553
554 efl_pack_clear(box); 554 efl_pack_clear(box);
555 fail_if(efl_content_count(box) != 0); 555 fail_if(efl_content_count(box) != 0);
@@ -661,7 +661,7 @@ START_TEST(edje_test_table_eoapi)
661 661
662 /* items have a text part "text" containing their position */ 662 /* items have a text part "text" containing their position */
663 sprintf(buf, "%d,%d", k, l); 663 sprintf(buf, "%d,%d", k, l);
664 sobj = efl_pack_grid_content_at(table, k, l); 664 sobj = efl_pack_grid_content_get(table, k, l);
665 fail_if(!sobj); 665 fail_if(!sobj);
666 //txt = efl_part_text_get(sobj, "text"); 666 //txt = efl_part_text_get(sobj, "text");
667 txt = edje_object_part_text_get(sobj, "text"); 667 txt = edje_object_part_text_get(sobj, "text");
@@ -685,7 +685,7 @@ START_TEST(edje_test_table_eoapi)
685 it = efl_content_iterate(table); 685 it = efl_content_iterate(table);
686 EINA_ITERATOR_FOREACH(it, sobj) 686 EINA_ITERATOR_FOREACH(it, sobj)
687 { 687 {
688 efl_pack_grid_content_position_get(table, sobj, &k, &l, &cs, &rs); 688 efl_pack_grid_position_get(table, sobj, &k, &l, &cs, &rs);
689 fail_if(cs != 1); 689 fail_if(cs != 1);
690 fail_if(rs != 1); 690 fail_if(rs != 1);
691 if (l >= 2) 691 if (l >= 2)