summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@osg.samsung.com>2017-11-02 14:03:30 +0100
committerDaniel Kolesa <d.kolesa@osg.samsung.com>2017-11-02 14:03:30 +0100
commit9ec1b4fa532f461970ddcd3d1742a0bef4e16550 (patch)
treec6ff138c00dd915775991d2c2e04089cf6874b45
parent263c3ac2ae2a67402bfb86136a079681c382c9e5 (diff)
downloadefl-9ec1b4fa532f461970ddcd3d1742a0bef4e16550.tar.gz
eolian: fix tests following the container restrictions
-rw-r--r--src/tests/eolian/data/complex_type.eo2
-rw-r--r--src/tests/eolian/data/object_impl.eo6
-rw-r--r--src/tests/eolian/data/object_impl_add.eo2
-rw-r--r--src/tests/eolian/data/owning.eo10
-rw-r--r--src/tests/eolian/eolian_parsing.c2
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 {
get {
}
values {
- value: list<int> @owned;
+ value: list<string> @owned;
}
}
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) {
@property a {
set {
values {
- value: const(list<int>);
+ value: const(list<string>);
}
return: bool (false);
}
@@ -13,7 +13,7 @@ class Object_Impl (Base) {
part: string;
}
values {
- value: list<int> @owned;
+ value: list<string> @owned;
}
}
@property b {
@@ -23,7 +23,7 @@ class Object_Impl (Base) {
/* set as virtual pure - no implementation expected */
}
values {
- value: list<int> @owned;
+ value: list<string> @owned;
}
}
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) {
/* set as virtual pure - no implementation expected */
}
values {
- value: list<int> @owned;
+ value: list<string> @owned;
}
}
}
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 {
methods {
test1 {
params {
- test1 : list<int> @owned;
- test2 : iterator<int> @owned;
- test3 : hash<int, int> @owned;
- test4 : accessor<int> @owned;
+ test1 : list<string> @owned;
+ test2 : iterator<string> @owned;
+ test3 : hash<string, string> @owned;
+ test4 : accessor<string> @owned;
}
}
test2 {
params {
test1 : list<ptr(Test.A) @owned> @owned;
test2 : iterator<ptr(Test.A) @owned> @owned;
- test3 : hash<int, ptr(Test.A) @owned> @owned;
+ test3 : hash<string, ptr(Test.A) @owned> @owned;
test4 : accessor<ptr(Test.A) @owned> @owned;
}
}
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)
fail_if(!!eolian_type_next_type_get(type));
fail_if(!(type_name = eolian_type_c_type_get(type, EOLIAN_C_TYPE_DEFAULT)));
fail_if(eolian_type_is_owned(type));
- fail_if(strcmp(type_name, "int"));
+ fail_if(strcmp(type_name, "const char *"));
eina_stringshare_del(type_name);
/* Methods return type */