summaryrefslogtreecommitdiff
path: root/src/tests/efl_mono
diff options
context:
space:
mode:
authorDaniel Kolesa <d.kolesa@samsung.com>2019-09-20 18:02:07 +0200
committerDaniel Kolesa <d.kolesa@samsung.com>2019-09-20 18:03:39 +0200
commit53a3326ddc74634093d9bd06e3d5c23fcd783b54 (patch)
tree64bc00b31e15d6a467e2273d94c510774816cc9c /src/tests/efl_mono
parent7cbd08ee8c577d35699d937b56c95a65ffcbcd67 (diff)
eolian: rename any_value_ptr -> any_value_ref for consistency
Diffstat (limited to 'src/tests/efl_mono')
-rw-r--r--src/tests/efl_mono/StructHelpers.cs8
-rw-r--r--src/tests/efl_mono/ValueEolian.cs2
-rw-r--r--src/tests/efl_mono/dummy_test_object.c6
-rw-r--r--src/tests/efl_mono/dummy_test_object.eo16
4 files changed, 16 insertions, 16 deletions
diff --git a/src/tests/efl_mono/StructHelpers.cs b/src/tests/efl_mono/StructHelpers.cs
index aeafe9e..d07c6c0 100644
--- a/src/tests/efl_mono/StructHelpers.cs
+++ b/src/tests/efl_mono/StructHelpers.cs
@@ -141,8 +141,8 @@ internal class StructHelpers
141 complex.Fany_value = new Eina.Value(Eina.ValueType.Double); 141 complex.Fany_value = new Eina.Value(Eina.ValueType.Double);
142 complex.Fany_value.Set(-9007199254740992.0); 142 complex.Fany_value.Set(-9007199254740992.0);
143 143
144 complex.Fany_value_ptr = new Eina.Value(Eina.ValueType.String); 144 complex.Fany_value_ref = new Eina.Value(Eina.ValueType.String);
145 complex.Fany_value_ptr.Set("abc"); 145 complex.Fany_value_ref.Set("abc");
146 146
147 complex.Fbinbuf = new Eina.Binbuf(); 147 complex.Fbinbuf = new Eina.Binbuf();
148 complex.Fbinbuf.Append(126); 148 complex.Fbinbuf.Append(126);
@@ -180,7 +180,7 @@ internal class StructHelpers
180 Test.Assert(double_val == -9007199254740992.0); 180 Test.Assert(double_val == -9007199254740992.0);
181 181
182 string str_val = null; 182 string str_val = null;
183 Test.Assert(complex.Fany_value_ptr.Get(out str_val)); 183 Test.Assert(complex.Fany_value_ref.Get(out str_val));
184 Test.Assert(str_val == "abc"); 184 Test.Assert(str_val == "abc");
185 185
186 Test.Assert(complex.Fbinbuf.Length == 1); 186 Test.Assert(complex.Fbinbuf.Length == 1);
@@ -201,7 +201,7 @@ internal class StructHelpers
201 Test.Assert(complex.Fhash == null); 201 Test.Assert(complex.Fhash == null);
202 Test.Assert(complex.Fiterator == null); 202 Test.Assert(complex.Fiterator == null);
203 Test.Assert(complex.Fany_value == null); 203 Test.Assert(complex.Fany_value == null);
204 Test.Assert(complex.Fany_value_ptr == null); 204 Test.Assert(complex.Fany_value_ref == null);
205 Test.Assert(complex.Fbinbuf == null); 205 Test.Assert(complex.Fbinbuf == null);
206 206
207 Test.Assert(complex.Fslice.Length == 0); 207 Test.Assert(complex.Fslice.Length == 0);
diff --git a/src/tests/efl_mono/ValueEolian.cs b/src/tests/efl_mono/ValueEolian.cs
index 80ec70e..97baf95 100644
--- a/src/tests/efl_mono/ValueEolian.cs
+++ b/src/tests/efl_mono/ValueEolian.cs
@@ -162,7 +162,7 @@ public static class TestEinaValueEolian {
162 } 162 }
163 163
164// ValueType in eolian context is beta, so not allowed. 164// ValueType in eolian context is beta, so not allowed.
165// Value does not have this problem as it is used as any_value/any_value_ptr 165// Value does not have this problem as it is used as any_value/any_value_ref
166#if EFL_BETA 166#if EFL_BETA
167 public static void TestEolianEinaValueTypeMarshalling() 167 public static void TestEolianEinaValueTypeMarshalling()
168 { 168 {
diff --git a/src/tests/efl_mono/dummy_test_object.c b/src/tests/efl_mono/dummy_test_object.c
index 110af73..0406dd3 100644
--- a/src/tests/efl_mono/dummy_test_object.c
+++ b/src/tests/efl_mono/dummy_test_object.c
@@ -4117,8 +4117,8 @@ void struct_complex_with_values(Dummy_StructComplex *complex)
4117 eina_value_setup(&complex->fany_value, EINA_VALUE_TYPE_DOUBLE); 4117 eina_value_setup(&complex->fany_value, EINA_VALUE_TYPE_DOUBLE);
4118 eina_value_set(&complex->fany_value, -9007199254740992.0); 4118 eina_value_set(&complex->fany_value, -9007199254740992.0);
4119 4119
4120 complex->fany_value_ptr = eina_value_new(EINA_VALUE_TYPE_STRING); 4120 complex->fany_value_ref = eina_value_new(EINA_VALUE_TYPE_STRING);
4121 eina_value_set(complex->fany_value_ptr, "abc"); 4121 eina_value_set(complex->fany_value_ref, "abc");
4122 4122
4123 complex->fbinbuf = eina_binbuf_new(); 4123 complex->fbinbuf = eina_binbuf_new();
4124 eina_binbuf_append_char(complex->fbinbuf, 126); 4124 eina_binbuf_append_char(complex->fbinbuf, 126);
@@ -4152,7 +4152,7 @@ Eina_Bool check_and_modify_struct_complex(Dummy_StructComplex *complex)
4152 return EINA_FALSE; 4152 return EINA_FALSE;
4153 4153
4154 const char *str_val = NULL; 4154 const char *str_val = NULL;
4155 if (!eina_value_get(complex->fany_value_ptr, &str_val) || strcmp(str_val, "abc") != 0) 4155 if (!eina_value_get(complex->fany_value_ref, &str_val) || strcmp(str_val, "abc") != 0)
4156 return EINA_FALSE; 4156 return EINA_FALSE;
4157 4157
4158 if (eina_binbuf_length_get(complex->fbinbuf) != 1 || eina_binbuf_string_get(complex->fbinbuf)[0] != 126) 4158 if (eina_binbuf_length_get(complex->fbinbuf) != 1 || eina_binbuf_string_get(complex->fbinbuf)[0] != 126)
diff --git a/src/tests/efl_mono/dummy_test_object.eo b/src/tests/efl_mono/dummy_test_object.eo
index 52eab41..c8f4b1e 100644
--- a/src/tests/efl_mono/dummy_test_object.eo
+++ b/src/tests/efl_mono/dummy_test_object.eo
@@ -79,7 +79,7 @@ struct @free(free) Dummy.StructComplex {
79 fhash: hash<string, string>; 79 fhash: hash<string, string>;
80 fiterator: iterator<string>; 80 fiterator: iterator<string>;
81 fany_value: any_value; 81 fany_value: any_value;
82 fany_value_ptr: any_value_ptr; 82 fany_value_ref: any_value_ref;
83 fbinbuf: binbuf; 83 fbinbuf: binbuf;
84 fslice: slice<ubyte>; 84 fslice: slice<ubyte>;
85 // fslice: ptr(Eina.Slice); // TODO 85 // fslice: ptr(Eina.Slice); // TODO
@@ -1243,13 +1243,13 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
1243 /* Eina Values */ 1243 /* Eina Values */
1244 set_value_ptr { 1244 set_value_ptr {
1245 params { 1245 params {
1246 value: any_value_ptr; 1246 value: any_value_ref;
1247 } 1247 }
1248 } 1248 }
1249 1249
1250 set_value_ptr_own { 1250 set_value_ptr_own {
1251 params { 1251 params {
1252 value: any_value_ptr @move; 1252 value: any_value_ref @move;
1253 } 1253 }
1254 } 1254 }
1255 1255
@@ -1266,11 +1266,11 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
1266 } 1266 }
1267 1267
1268 get_value_ptr_own { 1268 get_value_ptr_own {
1269 return: any_value_ptr @move; 1269 return: any_value_ref @move;
1270 } 1270 }
1271 1271
1272 get_value_ptr { 1272 get_value_ptr {
1273 return: any_value_ptr; 1273 return: any_value_ref;
1274 } 1274 }
1275 1275
1276 /* Commented out due to issues regarding eolian treatment of any_value. 1276 /* Commented out due to issues regarding eolian treatment of any_value.
@@ -1287,13 +1287,13 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
1287 1287
1288 out_value_ptr { 1288 out_value_ptr {
1289 params { 1289 params {
1290 @out value: any_value_ptr; 1290 @out value: any_value_ref;
1291 } 1291 }
1292 } 1292 }
1293 1293
1294 out_value_ptr_own { 1294 out_value_ptr_own {
1295 params { 1295 params {
1296 @out value: any_value_ptr @move; 1296 @out value: any_value_ref @move;
1297 } 1297 }
1298 } 1298 }
1299 1299
@@ -1595,7 +1595,7 @@ class Dummy.Test_Object extends Efl.Object implements Dummy.Test_Iface {
1595 /* Futures */ 1595 /* Futures */
1596 1596
1597 get_future { 1597 get_future {
1598 return: future<any_value_ptr>; 1598 return: future<any_value_ref>;
1599 } 1599 }
1600 1600
1601 fulfill_promise { 1601 fulfill_promise {