diff options
author | Daniel Kolesa <d.kolesa@osg.samsung.com> | 2017-11-02 14:03:30 +0100 |
---|---|---|
committer | Daniel Kolesa <d.kolesa@osg.samsung.com> | 2017-11-02 14:03:30 +0100 |
commit | 9ec1b4fa532f461970ddcd3d1742a0bef4e16550 (patch) | |
tree | c6ff138c00dd915775991d2c2e04089cf6874b45 | |
parent | 263c3ac2ae2a67402bfb86136a079681c382c9e5 (diff) |
eolian: fix tests following the container restrictions
-rw-r--r-- | src/tests/eolian/data/complex_type.eo | 2 | ||||
-rw-r--r-- | src/tests/eolian/data/object_impl.eo | 6 | ||||
-rw-r--r-- | src/tests/eolian/data/object_impl_add.eo | 2 | ||||
-rw-r--r-- | src/tests/eolian/data/owning.eo | 10 | ||||
-rw-r--r-- | src/tests/eolian/eolian_parsing.c | 2 |
5 files changed, 11 insertions, 11 deletions
diff --git a/src/tests/eolian/data/complex_type.eo b/src/tests/eolian/data/complex_type.eo index 4c379703b3..e8fe1a785e 100644 --- a/src/tests/eolian/data/complex_type.eo +++ b/src/tests/eolian/data/complex_type.eo | |||
@@ -9,7 +9,7 @@ class Complex_Type { | |||
9 | get { | 9 | get { |
10 | } | 10 | } |
11 | values { | 11 | values { |
12 | value: list<int> @owned; | 12 | value: list<string> @owned; |
13 | } | 13 | } |
14 | } | 14 | } |
15 | foo { | 15 | foo { |
diff --git a/src/tests/eolian/data/object_impl.eo b/src/tests/eolian/data/object_impl.eo index 7eb4f36e5a..7019225118 100644 --- a/src/tests/eolian/data/object_impl.eo +++ b/src/tests/eolian/data/object_impl.eo | |||
@@ -3,7 +3,7 @@ class Object_Impl (Base) { | |||
3 | @property a { | 3 | @property a { |
4 | set { | 4 | set { |
5 | values { | 5 | values { |
6 | value: const(list<int>); | 6 | value: const(list<string>); |
7 | } | 7 | } |
8 | return: bool (false); | 8 | return: bool (false); |
9 | } | 9 | } |
@@ -13,7 +13,7 @@ class Object_Impl (Base) { | |||
13 | part: string; | 13 | part: string; |
14 | } | 14 | } |
15 | values { | 15 | values { |
16 | value: list<int> @owned; | 16 | value: list<string> @owned; |
17 | } | 17 | } |
18 | } | 18 | } |
19 | @property b { | 19 | @property b { |
@@ -23,7 +23,7 @@ class Object_Impl (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<int> @owned; | 26 | value: list<string> @owned; |
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 3fa58924ff..4059110c08 100644 --- a/src/tests/eolian/data/object_impl_add.eo +++ b/src/tests/eolian/data/object_impl_add.eo | |||
@@ -9,7 +9,7 @@ class Object_Impl_Add (Base) { | |||
9 | /* set as virtual pure - no implementation expected */ | 9 | /* set as virtual pure - no implementation expected */ |
10 | } | 10 | } |
11 | values { | 11 | values { |
12 | value: list<int> @owned; | 12 | value: list<string> @owned; |
13 | } | 13 | } |
14 | } | 14 | } |
15 | } | 15 | } |
diff --git a/src/tests/eolian/data/owning.eo b/src/tests/eolian/data/owning.eo index 7330375405..f74d683b78 100644 --- a/src/tests/eolian/data/owning.eo +++ b/src/tests/eolian/data/owning.eo | |||
@@ -6,17 +6,17 @@ class Owning { | |||
6 | methods { | 6 | methods { |
7 | test1 { | 7 | test1 { |
8 | params { | 8 | params { |
9 | test1 : list<int> @owned; | 9 | test1 : list<string> @owned; |
10 | test2 : iterator<int> @owned; | 10 | test2 : iterator<string> @owned; |
11 | test3 : hash<int, int> @owned; | 11 | test3 : hash<string, string> @owned; |
12 | test4 : accessor<int> @owned; | 12 | test4 : accessor<string> @owned; |
13 | } | 13 | } |
14 | } | 14 | } |
15 | test2 { | 15 | test2 { |
16 | params { | 16 | params { |
17 | test1 : list<ptr(Test.A) @owned> @owned; | 17 | test1 : list<ptr(Test.A) @owned> @owned; |
18 | test2 : iterator<ptr(Test.A) @owned> @owned; | 18 | test2 : iterator<ptr(Test.A) @owned> @owned; |
19 | test3 : hash<int, ptr(Test.A) @owned> @owned; | 19 | test3 : hash<string, ptr(Test.A) @owned> @owned; |
20 | test4 : accessor<ptr(Test.A) @owned> @owned; | 20 | test4 : accessor<ptr(Test.A) @owned> @owned; |
21 | } | 21 | } |
22 | } | 22 | } |
diff --git a/src/tests/eolian/eolian_parsing.c b/src/tests/eolian/eolian_parsing.c index c9d07ba607..9297932451 100644 --- a/src/tests/eolian/eolian_parsing.c +++ b/src/tests/eolian/eolian_parsing.c | |||
@@ -444,7 +444,7 @@ START_TEST(eolian_complex_type) | |||
444 | fail_if(!!eolian_type_next_type_get(type)); | 444 | fail_if(!!eolian_type_next_type_get(type)); |
445 | fail_if(!(type_name = eolian_type_c_type_get(type, EOLIAN_C_TYPE_DEFAULT))); | 445 | fail_if(!(type_name = eolian_type_c_type_get(type, EOLIAN_C_TYPE_DEFAULT))); |
446 | fail_if(eolian_type_is_owned(type)); | 446 | fail_if(eolian_type_is_owned(type)); |
447 | fail_if(strcmp(type_name, "int")); | 447 | fail_if(strcmp(type_name, "const char *")); |
448 | eina_stringshare_del(type_name); | 448 | eina_stringshare_del(type_name); |
449 | 449 | ||
450 | /* Methods return type */ | 450 | /* Methods return type */ |