From: Rico Tzschichholz <ricotz@ubuntu.com>
Date: Mon, 27 Nov 2023 21:39:07 +0000 (+0100)
Subject: tests: Extend girwriter test with array length-type usage to increase coverage
X-Git-Tag: 0.56.15~24
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=c6ac1659eeacd08e6fcca3808bc5abb94cc9dd17;p=thirdparty%2Fvala.git

tests: Extend girwriter test with array length-type usage to increase coverage
---

diff --git a/tests/girwriter/GirTest-1.0.gir-expected b/tests/girwriter/GirTest-1.0.gir-expected
index b16a81df3..d00bce7fd 100644
--- a/tests/girwriter/GirTest-1.0.gir-expected
+++ b/tests/girwriter/GirTest-1.0.gir-expected
@@ -399,6 +399,37 @@
 				</parameter>
 			</parameters>
 		</method>
+		<method name="array_size_t_length" c:identifier="gir_test_object_test_array_size_t_length">
+			<return-value transfer-ownership="full">
+				<array length="4" c:type="gint*">
+					<type name="gint" c:type="gint"/>
+				</array>
+			</return-value>
+			<parameters>
+				<instance-parameter name="self" transfer-ownership="none">
+					<type name="GirTest.ObjectTest" c:type="GirTestObjectTest*"/>
+				</instance-parameter>
+				<parameter name="array" transfer-ownership="none">
+					<array length="1" c:type="gint*">
+						<type name="gint" c:type="gint"/>
+					</array>
+				</parameter>
+				<parameter name="array_length1" transfer-ownership="full">
+					<type name="gulong" c:type="gsize"/>
+				</parameter>
+				<parameter name="array2" direction="out" transfer-ownership="full">
+					<array length="3" c:type="gint**">
+						<type name="gint" c:type="gint"/>
+					</array>
+				</parameter>
+				<parameter name="array2_length1" direction="out" transfer-ownership="full">
+					<type name="gulong" c:type="gsize*"/>
+				</parameter>
+				<parameter name="result_length1" direction="out" transfer-ownership="full">
+					<type name="gulong" c:type="gsize*"/>
+				</parameter>
+			</parameters>
+		</method>
 		<method name="array_inout" c:identifier="gir_test_object_test_array_inout">
 			<return-value transfer-ownership="full">
 				<type name="none" c:type="void"/>
diff --git a/tests/girwriter/girtest.vala b/tests/girwriter/girtest.vala
index 44f54034e..bb8ac15a5 100644
--- a/tests/girwriter/girtest.vala
+++ b/tests/girwriter/girtest.vala
@@ -280,6 +280,11 @@ namespace GirTest {
 		public void array_in (int[] array) {
 		}
 
+		public int[:size_t] array_size_t_length (int[:size_t] array, out int[:size_t] array2) {
+			array2 = new int[8:size_t];
+			return new int[8:size_t];
+		}
+
 		public void array_inout (ref int[] array) {
 			assert (array.length > 0);
 			array = new int[8];
diff --git a/tests/girwriter/girtest.vapi-expected b/tests/girwriter/girtest.vapi-expected
index 41a93cb1c..663998cec 100644
--- a/tests/girwriter/girtest.vapi-expected
+++ b/tests/girwriter/girtest.vapi-expected
@@ -72,6 +72,7 @@ namespace GirTest {
 		public void array_out (out int[] array);
 		public int[] array_return ();
 		public int[] array_return_int_in_delegate_out (int i1, out GirTest.DelegateTest d);
+		public int[:size_t] array_size_t_length (int[:size_t] array, out int[:size_t] array2);
 		public (unowned string)[] container_return ();
 		public async void coroutine_async ();
 		public virtual async void coroutine_method_throw (int i1, out int o1) throws GirTest.ErrorTest;
diff --git a/tests/girwriter/girtest.vapigen-expected b/tests/girwriter/girtest.vapigen-expected
index 00ddb4503..9ec22e5ad 100644
--- a/tests/girwriter/girtest.vapigen-expected
+++ b/tests/girwriter/girtest.vapigen-expected
@@ -84,6 +84,8 @@ namespace GirTest {
 		public int[] array_return ();
 		[CCode (array_length_pos = 2.3)]
 		public int[] array_return_int_in_delegate_out (int i1, out GirTest.DelegateTest d);
+		[CCode (array_length_pos = 2.2, array_length_type = "gsize")]
+		public int[] array_size_t_length ([CCode (array_length_cname = "array_length1", array_length_pos = 1.5, array_length_type = "gsize")] int[] array, [CCode (array_length_cname = "array2_length1", array_length_pos = 2.1, array_length_type = "gsize")] out int[] array2);
 		[CCode (array_length_pos = 0.1)]
 		public (unowned string)[] container_return ();
 		public async void coroutine_async ();