summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <mail@marcel-hollerbach.de>2019-07-25 19:24:58 +0200
committerMarcel Hollerbach <mail@marcel-hollerbach.de>2019-07-25 19:48:16 +0200
commitc27fcae2888466590dc38c44e740106bbf04c0d5 (patch)
treeac713296f6084249182fc41cde965abc66e54b9e
parentdd0b3fe5ceaeb61ae82c4208f046e8b24fd5bf0f (diff)
efl_ui_spec_suite: simplify this
when i initially added item_container to the spec test suite, there was no plan to make Efl.Ui.List / Efl.Ui.Grid like it is now. However, now we can simply use Efl.Ui.List and Grid instead of this helper class. Differential Revision: https://phab.enlightenment.org/D9409
-rw-r--r--src/tests/elementary/spec/efl_test_pack_linear.c4
-rw-r--r--src/tests/elementary/spec/efl_ui_spec_suite.c12
-rw-r--r--src/tests/elementary/spec/efl_ui_spec_suite.h1
-rw-r--r--src/tests/elementary/spec/meson.build18
-rw-r--r--src/tests/elementary/spec/test_efl_ui_item_container_list.eo6
5 files changed, 2 insertions, 39 deletions
diff --git a/src/tests/elementary/spec/efl_test_pack_linear.c b/src/tests/elementary/spec/efl_test_pack_linear.c
index 4da2f8538e..71746eaeee 100644
--- a/src/tests/elementary/spec/efl_test_pack_linear.c
+++ b/src/tests/elementary/spec/efl_test_pack_linear.c
@@ -9,10 +9,10 @@
9 9
10/* spec-meta-start 10/* spec-meta-start
11 {"test-interface":"Efl.Pack_Linear", 11 {"test-interface":"Efl.Pack_Linear",
12 "test-widgets": ["Efl.Ui.Box", "Efl.Ui.Grid", "Efl.Ui.Spotlight.Container", "Test.Efl.Ui.Item_Container_List"], 12 "test-widgets": ["Efl.Ui.Box", "Efl.Ui.Grid", "Efl.Ui.Spotlight.Container", "Efl.Ui.List"],
13 "custom-mapping" : { 13 "custom-mapping" : {
14 "Efl.Ui.Grid" : "EFL_UI_GRID_DEFAULT_ITEM_CLASS", 14 "Efl.Ui.Grid" : "EFL_UI_GRID_DEFAULT_ITEM_CLASS",
15 "Test.Efl.Ui.Item_Container_List" : "EFL_UI_LIST_DEFAULT_ITEM_CLASS" 15 "Efl.Ui.List" : "EFL_UI_LIST_DEFAULT_ITEM_CLASS"
16 } 16 }
17 } 17 }
18 spec-meta-end */ 18 spec-meta-end */
diff --git a/src/tests/elementary/spec/efl_ui_spec_suite.c b/src/tests/elementary/spec/efl_ui_spec_suite.c
index 8316e36bc7..dc5462a89e 100644
--- a/src/tests/elementary/spec/efl_ui_spec_suite.c
+++ b/src/tests/elementary/spec/efl_ui_spec_suite.c
@@ -8,16 +8,6 @@
8#include "suite_helpers.h" 8#include "suite_helpers.h"
9#include "eo_internal.h" 9#include "eo_internal.h"
10 10
11//helper functions for custom widget intialization
12EOLIAN static Efl_Object*
13_test_efl_ui_item_container_list_efl_object_constructor(Eo *obj, void *pd EINA_UNUSED)
14{
15 efl_constructor(efl_super(obj, TEST_EFL_UI_ITEM_CONTAINER_LIST_CLASS));
16 efl_ui_collection_position_manager_set(obj, efl_new(EFL_UI_POSITION_MANAGER_LIST_CLASS));
17
18 return obj;
19}
20
21Evas_Object *win = NULL; 11Evas_Object *win = NULL;
22Evas_Object *widget = NULL; 12Evas_Object *widget = NULL;
23const Efl_Class *test_content_klass = NULL; 13const Efl_Class *test_content_klass = NULL;
@@ -73,5 +63,3 @@ main(int argc, char **argv)
73 63
74 return (failed_count == 0) ? 0 : 255; 64 return (failed_count == 0) ? 0 : 255;
75} 65}
76
77#include "test_efl_ui_item_container_list.eo.c"
diff --git a/src/tests/elementary/spec/efl_ui_spec_suite.h b/src/tests/elementary/spec/efl_ui_spec_suite.h
index 6ea53fc801..01be37652d 100644
--- a/src/tests/elementary/spec/efl_ui_spec_suite.h
+++ b/src/tests/elementary/spec/efl_ui_spec_suite.h
@@ -5,7 +5,6 @@
5 5
6#define EFL_NOLEGACY_API_SUPPORT 6#define EFL_NOLEGACY_API_SUPPORT
7#include <Efl_Ui.h> 7#include <Efl_Ui.h>
8#include "test_efl_ui_item_container_list.eo.h"
9#include "../efl_check.h" 8#include "../efl_check.h"
10 9
11extern Evas_Object *win; 10extern Evas_Object *win;
diff --git a/src/tests/elementary/spec/meson.build b/src/tests/elementary/spec/meson.build
index d9fadd9c68..d23c3860dc 100644
--- a/src/tests/elementary/spec/meson.build
+++ b/src/tests/elementary/spec/meson.build
@@ -1,7 +1,3 @@
1priv_eo_files = [
2 'test_efl_ui_item_container_list.eo',
3]
4
5efl_ui_suite_behavior_test_files = files([ 1efl_ui_suite_behavior_test_files = files([
6 'efl_test_pack.c', 2 'efl_test_pack.c',
7 'efl_test_pack_linear.c', 3 'efl_test_pack_linear.c',
@@ -24,20 +20,6 @@ efl_ui_suite_behavior_src = files([
24 20
25test_generator = find_program('generator.py') 21test_generator = find_program('generator.py')
26 22
27
28priv_eo_file_target = []
29foreach eo_file : priv_eo_files
30 priv_eo_file_target += custom_target('eolian_gen_' + eo_file,
31 input : eo_file,
32 output : [eo_file + '.h'],
33 depfile : eo_file + '.d',
34 command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
35 '-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
36 '-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
37 '-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
38 '-gchd', '@INPUT@'])
39endforeach
40
41generated_test_parts = custom_target('generate_test_suite', 23generated_test_parts = custom_target('generate_test_suite',
42 input: efl_ui_suite_behavior_test_files, 24 input: efl_ui_suite_behavior_test_files,
43 output: 'efl_ui_spec_suite_gen.x', 25 output: 'efl_ui_spec_suite_gen.x',
diff --git a/src/tests/elementary/spec/test_efl_ui_item_container_list.eo b/src/tests/elementary/spec/test_efl_ui_item_container_list.eo
deleted file mode 100644
index e1cb3e9884..0000000000
--- a/src/tests/elementary/spec/test_efl_ui_item_container_list.eo
+++ /dev/null
@@ -1,6 +0,0 @@
1class @beta Test.Efl.Ui.Item_Container_List extends Efl.Ui.Collection {
2 data: null;
3 implements {
4 Efl.Object.constructor;
5 }
6}