summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2020-01-02 15:23:14 -0800
committerFelipe Magno de Almeida <felipe@expertisesolutions.com.br>2020-01-24 21:47:08 -0300
commit1d28ff6a76f65284b467f832c2f577fe9f656b6f (patch)
tree5a2028dcee90bfeb1d9a99ad6ea5ec6195cf3528
parent0f49f5e472528bfc992a14ecfc504a2aa2290741 (diff)
eolian: move list<> tests to be @beta and preserve enough meaningful that are not @beta.
Reviewed-by: Daniel Kolesa <daniel@octaforge.org> Reviewed-by: Felipe Magno de Almeida <felipe@expertisesolutions.com.br> Differential Revision: https://phab.enlightenment.org/D11046
-rw-r--r--src/tests/eolian/data/complex_type.eo4
-rw-r--r--src/tests/eolian/data/object_impl.eo4
-rw-r--r--src/tests/eolian/data/object_impl_add.eo2
-rw-r--r--src/tests/eolian/data/object_impl_add_ref.c2
-rw-r--r--src/tests/eolian/data/object_impl_ref.c2
-rw-r--r--src/tests/eolian/data/typedef.eo2
-rw-r--r--src/tests/eolian/data/typedef_ref.h2
-rw-r--r--src/tests/eolian/data/typedef_ref_stub.h2
-rw-r--r--src/tests/eolian/eolian_generation.c1
-rw-r--r--src/tests/eolian/eolian_parsing.c2
10 files changed, 12 insertions, 11 deletions
diff --git a/src/tests/eolian/data/complex_type.eo b/src/tests/eolian/data/complex_type.eo
index 9cb6a1faf1..82613a1641 100644
--- a/src/tests/eolian/data/complex_type.eo
+++ b/src/tests/eolian/data/complex_type.eo
@@ -1,6 +1,6 @@
1class Complex_Type { 1class Complex_Type {
2 methods { 2 methods {
3 @property a { 3 @property a @beta {
4 set { 4 set {
5 return: list<array<strbuf @move> > @move; 5 return: list<array<strbuf @move> > @move;
6 } 6 }
@@ -10,7 +10,7 @@ class Complex_Type {
10 value: list<string> @move; 10 value: list<string> @move;
11 } 11 }
12 } 12 }
13 foo { 13 foo @beta {
14 params { 14 params {
15 buf: mstring @move; 15 buf: mstring @move;
16 sl: slice<ubyte>; 16 sl: slice<ubyte>;
diff --git a/src/tests/eolian/data/object_impl.eo b/src/tests/eolian/data/object_impl.eo
index 7fe8ce2e24..aa708a8bd7 100644
--- a/src/tests/eolian/data/object_impl.eo
+++ b/src/tests/eolian/data/object_impl.eo
@@ -1,6 +1,6 @@
1abstract Object_Impl extends Base { 1abstract Object_Impl extends Base {
2 methods { 2 methods {
3 @property a { 3 @property a @beta {
4 set { 4 set {
5 values { 5 values {
6 value: const(list<string>); 6 value: const(list<string>);
@@ -23,7 +23,7 @@ abstract Object_Impl extends Base {
23 /* set as virtual pure - no implementation expected */ 23 /* set as virtual pure - no implementation expected */
24 } 24 }
25 values { 25 values {
26 value: list<string> @move; 26 value: iterator<string> @move;
27 } 27 }
28 } 28 }
29 constructor_1 { 29 constructor_1 {
diff --git a/src/tests/eolian/data/object_impl_add.eo b/src/tests/eolian/data/object_impl_add.eo
index c1e82e2365..b8113a2f01 100644
--- a/src/tests/eolian/data/object_impl_add.eo
+++ b/src/tests/eolian/data/object_impl_add.eo
@@ -2,7 +2,7 @@ class Object_Impl_Add extends Base {
2 data: Object_Impl_Data; 2 data: Object_Impl_Data;
3 3
4 methods { 4 methods {
5 @property c { 5 @property c @beta {
6 set { 6 set {
7 } 7 }
8 get { 8 get {
diff --git a/src/tests/eolian/data/object_impl_add_ref.c b/src/tests/eolian/data/object_impl_add_ref.c
index f6b8fa5927..55f57578bb 100644
--- a/src/tests/eolian/data/object_impl_add_ref.c
+++ b/src/tests/eolian/data/object_impl_add_ref.c
@@ -20,7 +20,7 @@ _object_impl_a_get(const Eo *obj, Object_Impl_Data *pd, const char *part)
20} 20}
21 21
22EOLIAN static void 22EOLIAN static void
23_object_impl_b_set(Eo *obj, Object_Impl_Data *pd, Eina_List *value) 23_object_impl_b_set(Eo *obj, Object_Impl_Data *pd, Eina_Iterator *value)
24{ 24{
25 25
26} 26}
diff --git a/src/tests/eolian/data/object_impl_ref.c b/src/tests/eolian/data/object_impl_ref.c
index ddc0d7ccd5..32a331529f 100644
--- a/src/tests/eolian/data/object_impl_ref.c
+++ b/src/tests/eolian/data/object_impl_ref.c
@@ -20,7 +20,7 @@ _object_impl_a_get(const Eo *obj, Object_Impl_Data *pd, const char *part)
20} 20}
21 21
22EOLIAN static void 22EOLIAN static void
23_object_impl_b_set(Eo *obj, Object_Impl_Data *pd, Eina_List *value) 23_object_impl_b_set(Eo *obj, Object_Impl_Data *pd, Eina_Iterator *value)
24{ 24{
25 25
26} 26}
diff --git a/src/tests/eolian/data/typedef.eo b/src/tests/eolian/data/typedef.eo
index 916a39fcfc..cb97dd12ad 100644
--- a/src/tests/eolian/data/typedef.eo
+++ b/src/tests/eolian/data/typedef.eo
@@ -1,5 +1,5 @@
1type Evas.Coord: int; /* Simple type definition */ 1type Evas.Coord: int; /* Simple type definition */
2type List_Objects: list<Typedef>; /* A little more complex */ 2type List_Objects: iterator<Typedef>; /* A little more complex */
3 3
4type Evas.Coord2: Evas.Coord; 4type Evas.Coord2: Evas.Coord;
5type Evas.Coord3: Evas.Coord2; 5type Evas.Coord3: Evas.Coord2;
diff --git a/src/tests/eolian/data/typedef_ref.h b/src/tests/eolian/data/typedef_ref.h
index dd3f3ad85e..2a3b888394 100644
--- a/src/tests/eolian/data/typedef_ref.h
+++ b/src/tests/eolian/data/typedef_ref.h
@@ -13,7 +13,7 @@ typedef Eo Typedef;
13 13
14typedef int Evas_Coord; 14typedef int Evas_Coord;
15 15
16typedef Eina_List *List_Objects; 16typedef Eina_Iterator *List_Objects;
17 17
18typedef Evas_Coord Evas_Coord2; 18typedef Evas_Coord Evas_Coord2;
19 19
diff --git a/src/tests/eolian/data/typedef_ref_stub.h b/src/tests/eolian/data/typedef_ref_stub.h
index 0f6f4ec38b..1b18c46031 100644
--- a/src/tests/eolian/data/typedef_ref_stub.h
+++ b/src/tests/eolian/data/typedef_ref_stub.h
@@ -5,7 +5,7 @@ typedef Eo Typedef;
5 5
6typedef int Evas_Coord; 6typedef int Evas_Coord;
7 7
8typedef Eina_List *List_Objects; 8typedef Eina_Iterator *List_Objects;
9 9
10typedef Evas_Coord Evas_Coord2; 10typedef Evas_Coord Evas_Coord2;
11 11
diff --git a/src/tests/eolian/eolian_generation.c b/src/tests/eolian/eolian_generation.c
index f60bb875bf..8e0babd39d 100644
--- a/src/tests/eolian/eolian_generation.c
+++ b/src/tests/eolian/eolian_generation.c
@@ -106,6 +106,7 @@ EFL_START_TEST(eolian_dev_impl_code)
106 fail_if(0 != _eolian_gen_execute(TESTS_SRC_DIR"/data/object_impl.eo", "-gi", output_filepath)); 106 fail_if(0 != _eolian_gen_execute(TESTS_SRC_DIR"/data/object_impl.eo", "-gi", output_filepath));
107 fail_if(!_files_compare(TESTS_SRC_DIR"/data/object_impl_ref.c", output_filepath, "c")); 107 fail_if(!_files_compare(TESTS_SRC_DIR"/data/object_impl_ref.c", output_filepath, "c"));
108 fail_if(0 != _eolian_gen_execute(TESTS_SRC_DIR"/data/object_impl_add.eo", "-gi", output_filepath)); 108 fail_if(0 != _eolian_gen_execute(TESTS_SRC_DIR"/data/object_impl_add.eo", "-gi", output_filepath));
109 fprintf(stderr, "[%s]\n", output_filepath);
109 fail_if(!_files_compare(TESTS_SRC_DIR"/data/object_impl_add_ref.c", output_filepath, "c")); 110 fail_if(!_files_compare(TESTS_SRC_DIR"/data/object_impl_add_ref.c", output_filepath, "c"));
110} 111}
111EFL_END_TEST 112EFL_END_TEST
diff --git a/src/tests/eolian/eolian_parsing.c b/src/tests/eolian/eolian_parsing.c
index 9d137dcec3..b21af5a5c7 100644
--- a/src/tests/eolian/eolian_parsing.c
+++ b/src/tests/eolian/eolian_parsing.c
@@ -368,7 +368,7 @@ EFL_START_TEST(eolian_typedef)
368 fail_if(strcmp(type_name, "List_Objects")); 368 fail_if(strcmp(type_name, "List_Objects"));
369 fail_if(!(type = eolian_typedecl_base_type_get(tdl))); 369 fail_if(!(type = eolian_typedecl_base_type_get(tdl)));
370 fail_if(!(type_name = eolian_type_c_type_get(type))); 370 fail_if(!(type_name = eolian_type_c_type_get(type)));
371 fail_if(strcmp(type_name, "Eina_List *")); 371 fail_if(strcmp(type_name, "Eina_Iterator *"));
372 eina_stringshare_del(type_name); 372 eina_stringshare_del(type_name);
373 fail_if(!(type = eolian_type_base_type_get(type))); 373 fail_if(!(type = eolian_type_base_type_get(type)));
374 fail_if(!!eolian_type_next_type_get(type)); 374 fail_if(!!eolian_type_next_type_get(type));