aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLauro Moura <lauromoura@expertisesolutions.com.br>2019-07-10 11:08:57 -0300
committerLauro Moura <lauromoura@expertisesolutions.com.br>2019-07-10 11:08:57 -0300
commitbc307859daed4a2b87b410d5f609c36ecaddf891 (patch)
tree872494383e21e47f2e8bb9a3c9311304acc73491
parentWIP: Debugging inherited stuff (diff)
downloadefl-devs/lauromoura/tcautomated.tar.gz
testgen: Generate C# inherited test casesdevs/lauromoura/tcautomated
Also fix some typos
-rw-r--r--src/scripts/testgen/ekeys.py6
-rw-r--r--src/scripts/testgen/suitegen.py28
2 files changed, 19 insertions, 15 deletions
diff --git a/src/scripts/testgen/ekeys.py b/src/scripts/testgen/ekeys.py
index 28f595f5c0..6865ac8e12 100644
--- a/src/scripts/testgen/ekeys.py
+++ b/src/scripts/testgen/ekeys.py
@@ -6,8 +6,8 @@ from testgen import name_helpers
class Function_List_Type(IntEnum):
- INHERITIS = 1
- INHERITIS_FULL = 2
+ INHERITS = 1
+ INHERITS_FULL = 2
CLASS_IMPLEMENTS = 3
CLASS_ONLY = 4
@@ -39,6 +39,7 @@ class EKeys:
class EMonoKeys(EKeys):
def __init__(self, ext):
super().__init__(ext)
+ self.funclist = Function_List_Type.INHERITS_FULL
self.dicttypes = {
"byte": "sbyte",
"llong": "long",
@@ -140,6 +141,7 @@ class EMonoKeys(EKeys):
self.blacklist = [
"efl_event_callback_array_priority_add",
+ "efl_event_callback_forwarder_priority_add",
"efl_player_position_get",
"efl_text_font_source",
"efl_ui_focus_manager_focus_get",
diff --git a/src/scripts/testgen/suitegen.py b/src/scripts/testgen/suitegen.py
index 733c9885ad..5811c0af9e 100644
--- a/src/scripts/testgen/suitegen.py
+++ b/src/scripts/testgen/suitegen.py
@@ -116,14 +116,13 @@ class ClassItem(ComItem):
print("Inherit", inherit)
for item in getter(inherit):
print("Checking item", item.full_c_method_name)
- if (item.full_c_method_name not in names):
+ if item.full_c_method_name not in names:
print("Adding item", item.full_c_method_name)
names.add(item.full_c_method_name)
yield item
self.methods = [
- FuncItem(m, self.path, keys)
- for m in filter(mfilter, get_all_inherited(self.comp, lambda x: x.methods))
+ FuncItem(m, self.path, keys) for m in filter(mfilter, self.comp.methods)
]
self._properties = [
FuncItem(p, self.path, keys) for p in filter(mfilter, self.comp.properties)
@@ -131,24 +130,27 @@ class ClassItem(ComItem):
self.events = [EventItem(s, self.path, keys) for s in self.comp.events]
if self.keys.funclist in (
- Function_List_Type.INHERITIS,
- Function_List_Type.INHERITIS_FULL,
+ Function_List_Type.INHERITS,
+ Function_List_Type.INHERITS_FULL,
):
for eoclass in (
- eoclass.inherits
- if self.keys.funclist == Function_List_Type.INHERITIS
- else eoclass.inherits_full
+ self.comp.inherits
+ if self.keys.funclist == Function_List_Type.INHERITS
+ else self.comp.inherits_full
):
for f in filter(mfilter, eoclass.methods):
self.methods.append(FuncItem(f, self.path, keys))
for f in filter(mfilter, eoclass.properties):
self._properties.append(FuncItem(f, self.path, keys))
elif self.keys.funclist == Function_List_Type.CLASS_IMPLEMENTS:
- for imp in filter(
- lambda i: not i.namespace == self.name
- and not i.short_name.lower() in self.keys.implementsbl,
- comp.implements,
- ): # FIXME implements list
+ for imp in comp.implements:
+
+ if (
+ imp.namespace == self.name
+ or imp.short_name.lower() in self.keys.implementsbl
+ ):
+ continue
+
f = imp.function
if f.type == Eolian_Function_Type.METHOD and mfilter(f):
self.methods.append(FuncItem(f, self.path, keys))