forked from enlightenment/efl
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. Reviewed-by: Cedric BAIL <cedric.bail@free.fr> Differential Revision: https://phab.enlightenment.org/D9409
This commit is contained in:
parent
a4f7baa911
commit
257b30f9de
|
@ -9,10 +9,10 @@
|
||||||
|
|
||||||
/* spec-meta-start
|
/* spec-meta-start
|
||||||
{"test-interface":"Efl.Pack_Linear",
|
{"test-interface":"Efl.Pack_Linear",
|
||||||
"test-widgets": ["Efl.Ui.Box", "Efl.Ui.Grid", "Efl.Ui.Spotlight.Container", "Test.Efl.Ui.Item_Container_List"],
|
"test-widgets": ["Efl.Ui.Box", "Efl.Ui.Grid", "Efl.Ui.Spotlight.Container", "Efl.Ui.List"],
|
||||||
"custom-mapping" : {
|
"custom-mapping" : {
|
||||||
"Efl.Ui.Grid" : "EFL_UI_GRID_DEFAULT_ITEM_CLASS",
|
"Efl.Ui.Grid" : "EFL_UI_GRID_DEFAULT_ITEM_CLASS",
|
||||||
"Test.Efl.Ui.Item_Container_List" : "EFL_UI_LIST_DEFAULT_ITEM_CLASS"
|
"Efl.Ui.List" : "EFL_UI_LIST_DEFAULT_ITEM_CLASS"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
spec-meta-end */
|
spec-meta-end */
|
||||||
|
|
|
@ -8,16 +8,6 @@
|
||||||
#include "suite_helpers.h"
|
#include "suite_helpers.h"
|
||||||
#include "eo_internal.h"
|
#include "eo_internal.h"
|
||||||
|
|
||||||
//helper functions for custom widget intialization
|
|
||||||
EOLIAN static Efl_Object*
|
|
||||||
_test_efl_ui_item_container_list_efl_object_constructor(Eo *obj, void *pd EINA_UNUSED)
|
|
||||||
{
|
|
||||||
efl_constructor(efl_super(obj, TEST_EFL_UI_ITEM_CONTAINER_LIST_CLASS));
|
|
||||||
efl_ui_collection_position_manager_set(obj, efl_new(EFL_UI_POSITION_MANAGER_LIST_CLASS));
|
|
||||||
|
|
||||||
return obj;
|
|
||||||
}
|
|
||||||
|
|
||||||
Evas_Object *win = NULL;
|
Evas_Object *win = NULL;
|
||||||
Evas_Object *widget = NULL;
|
Evas_Object *widget = NULL;
|
||||||
const Efl_Class *test_content_klass = NULL;
|
const Efl_Class *test_content_klass = NULL;
|
||||||
|
@ -73,5 +63,3 @@ main(int argc, char **argv)
|
||||||
|
|
||||||
return (failed_count == 0) ? 0 : 255;
|
return (failed_count == 0) ? 0 : 255;
|
||||||
}
|
}
|
||||||
|
|
||||||
#include "test_efl_ui_item_container_list.eo.c"
|
|
||||||
|
|
|
@ -5,7 +5,6 @@
|
||||||
|
|
||||||
#define EFL_NOLEGACY_API_SUPPORT
|
#define EFL_NOLEGACY_API_SUPPORT
|
||||||
#include <Efl_Ui.h>
|
#include <Efl_Ui.h>
|
||||||
#include "test_efl_ui_item_container_list.eo.h"
|
|
||||||
#include "../efl_check.h"
|
#include "../efl_check.h"
|
||||||
|
|
||||||
extern Evas_Object *win;
|
extern Evas_Object *win;
|
||||||
|
|
|
@ -1,7 +1,3 @@
|
||||||
priv_eo_files = [
|
|
||||||
'test_efl_ui_item_container_list.eo',
|
|
||||||
]
|
|
||||||
|
|
||||||
efl_ui_suite_behavior_test_files = files([
|
efl_ui_suite_behavior_test_files = files([
|
||||||
'efl_test_pack.c',
|
'efl_test_pack.c',
|
||||||
'efl_test_pack_linear.c',
|
'efl_test_pack_linear.c',
|
||||||
|
@ -24,20 +20,6 @@ efl_ui_suite_behavior_src = files([
|
||||||
|
|
||||||
test_generator = find_program('generator.py')
|
test_generator = find_program('generator.py')
|
||||||
|
|
||||||
|
|
||||||
priv_eo_file_target = []
|
|
||||||
foreach eo_file : priv_eo_files
|
|
||||||
priv_eo_file_target += custom_target('eolian_gen_' + eo_file,
|
|
||||||
input : eo_file,
|
|
||||||
output : [eo_file + '.h'],
|
|
||||||
depfile : eo_file + '.d',
|
|
||||||
command : eolian_gen + [ '-I', meson.current_source_dir(), eolian_include_directories,
|
|
||||||
'-o', 'h:' + join_paths(meson.current_build_dir(), eo_file + '.h'),
|
|
||||||
'-o', 'c:' + join_paths(meson.current_build_dir(), eo_file + '.c'),
|
|
||||||
'-o', 'd:' + join_paths(meson.current_build_dir(), eo_file + '.d'),
|
|
||||||
'-gchd', '@INPUT@'])
|
|
||||||
endforeach
|
|
||||||
|
|
||||||
generated_test_parts = custom_target('generate_test_suite',
|
generated_test_parts = custom_target('generate_test_suite',
|
||||||
input: efl_ui_suite_behavior_test_files,
|
input: efl_ui_suite_behavior_test_files,
|
||||||
output: 'efl_ui_spec_suite_gen.x',
|
output: 'efl_ui_spec_suite_gen.x',
|
||||||
|
|
|
@ -1,6 +0,0 @@
|
||||||
class @beta Test.Efl.Ui.Item_Container_List extends Efl.Ui.Collection {
|
|
||||||
data: null;
|
|
||||||
implements {
|
|
||||||
Efl.Object.constructor;
|
|
||||||
}
|
|
||||||
}
|
|
Loading…
Reference in New Issue