From 0463886b14b371598231e63c770121927f312ffd Mon Sep 17 00:00:00 2001 From: Rico Tzschichholz Date: Thu, 1 Apr 2021 15:33:43 +0200 Subject: [PATCH] tests/girwriter: Add tests for implicit parameters in virtual-method/callback --- tests/girwriter/GirTest-1.0.gir-expected | 249 +++++++++++++++++++++++ tests/girwriter/girtest.vala | 7 + tests/girwriter/girtest.vapi-expected | 3 + tests/girwriter/girtest.vapigen-expected | 3 + 4 files changed, 262 insertions(+) diff --git a/tests/girwriter/GirTest-1.0.gir-expected b/tests/girwriter/GirTest-1.0.gir-expected index 845293d78..d2e83c8fd 100644 --- a/tests/girwriter/GirTest-1.0.gir-expected +++ b/tests/girwriter/GirTest-1.0.gir-expected @@ -877,6 +877,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1155,6 +1209,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1438,6 +1521,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -1614,6 +1751,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2131,6 +2297,60 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -2372,6 +2592,35 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/tests/girwriter/girtest.vala b/tests/girwriter/girtest.vala index 092b88cd4..61f0f4724 100644 --- a/tests/girwriter/girtest.vala +++ b/tests/girwriter/girtest.vala @@ -87,6 +87,8 @@ namespace GirTest { [NoWrapper] public virtual async void no_wrapper_method_async () { } + public virtual void method_implicit_params (int[] param1, owned DelegateTest param2) { + } [HasEmitter] public signal void some_signal (int param); public static void static_method () { @@ -298,6 +300,9 @@ namespace GirTest { [NoWrapper] public virtual async void no_wrapper_method_async () { } + + public virtual void method_implicit_params (int[] param1, owned DelegateTest param2) { + } } public abstract class AbstractObjectTest : Object { @@ -321,6 +326,8 @@ namespace GirTest { [NoWrapper] public abstract async void no_wrapper_method_async (); + + public abstract void method_implicit_params (int[] param1, owned DelegateTest param2); } public interface PrerequisiteTest : InterfaceTest { diff --git a/tests/girwriter/girtest.vapi-expected b/tests/girwriter/girtest.vapi-expected index e1d7a4f69..7ed0bfe51 100644 --- a/tests/girwriter/girtest.vapi-expected +++ b/tests/girwriter/girtest.vapi-expected @@ -7,6 +7,7 @@ namespace GirTest { [CCode (cheader_filename = "girtest.h")] public abstract class AbstractObjectTest : GLib.Object { protected AbstractObjectTest (); + public abstract void method_implicit_params (int[] param1, owned GirTest.DelegateTest param2); public abstract void method_int8_in (int8 param); public abstract void method_int8_inout (ref int8 param); public abstract void method_int8_out (out int8 param); @@ -73,6 +74,7 @@ namespace GirTest { public int[] int_in_int_in_array_return (int param1, int param2); public ObjectTest.may_fail (int param) throws GirTest.ErrorTest; public void method (); + public virtual void method_implicit_params (int[] param1, owned GirTest.DelegateTest param2); public virtual void method_throw () throws GirTest.ErrorTest; public void method_valist (int param, va_list vargs); public void method_varargs (int param, ...); @@ -126,6 +128,7 @@ namespace GirTest { public interface InterfaceTest : GLib.Object { public virtual async void coroutine_async (); public virtual void int8_in (int8 param); + public virtual void method_implicit_params (int[] param1, owned GirTest.DelegateTest param2); public virtual void method_valist (int param, va_list vargs); [NoWrapper] public virtual void no_wrapper_method (); diff --git a/tests/girwriter/girtest.vapigen-expected b/tests/girwriter/girtest.vapigen-expected index cb0724d19..a4de2304d 100644 --- a/tests/girwriter/girtest.vapigen-expected +++ b/tests/girwriter/girtest.vapigen-expected @@ -9,6 +9,7 @@ namespace GirTest { [CCode (has_construct_function = false)] protected AbstractObjectTest (); public abstract void internal_method (int8 param); + public abstract void method_implicit_params ([CCode (array_length_cname = "param1_length1", array_length_pos = 1.5)] int[] param1, owned GirTest.DelegateTest param2); public abstract void method_int8_in (int8 param); public abstract void method_int8_inout (ref int8 param); public abstract void method_int8_out (out int8 param); @@ -105,6 +106,7 @@ namespace GirTest { [CCode (cname = "gir_test_object_test_new_may_fail", has_construct_function = false)] public ObjectTest.may_fail (int param) throws GirTest.ErrorTest; public void method (); + public virtual void method_implicit_params ([CCode (array_length_cname = "param1_length1", array_length_pos = 1.5)] int[] param1, owned GirTest.DelegateTest param2); public virtual void method_throw () throws GirTest.ErrorTest; public void method_valist (int param, va_list vargs); public void method_varargs (int param, ...); @@ -163,6 +165,7 @@ namespace GirTest { public virtual int get_property (); public virtual void int8_in (int8 param); public virtual void internal_method (); + public virtual void method_implicit_params ([CCode (array_length_cname = "param1_length1", array_length_pos = 1.5)] int[] param1, owned GirTest.DelegateTest param2); [NoWrapper] public virtual void no_wrapper_method (); [NoWrapper] -- 2.47.2