diff options
author | Rico Tzschichholz <ricotz@ubuntu.com> | 2021-11-24 23:12:54 +0100 |
---|---|---|
committer | Rico Tzschichholz <ricotz@ubuntu.com> | 2021-11-24 23:13:50 +0100 |
commit | 5f4134636a38e5a08b2d33487c0908b8464ad84b (patch) | |
tree | 61271f49cef12da51c5c8d594669b7b7b55b6a2d | |
parent | 0f493a1d0e67f480cfa979fd5a4f254659b2c869 (diff) | |
download | vala-5f4134636a38e5a08b2d33487c0908b8464ad84b.tar.gz |
tests/girwriter: Increase coverage
-rw-r--r-- | tests/girwriter/GirTest-1.0.gir-expected | 44 | ||||
-rw-r--r-- | tests/girwriter/girtest.vala | 15 | ||||
-rw-r--r-- | tests/girwriter/girtest.vapi-expected | 14 | ||||
-rw-r--r-- | tests/girwriter/girtest.vapigen-expected | 14 |
4 files changed, 87 insertions, 0 deletions
diff --git a/tests/girwriter/GirTest-1.0.gir-expected b/tests/girwriter/GirTest-1.0.gir-expected index 0843634a0..72b408d5a 100644 --- a/tests/girwriter/GirTest-1.0.gir-expected +++ b/tests/girwriter/GirTest-1.0.gir-expected @@ -2805,6 +2805,19 @@ </instance-parameter> </parameters> </method> + <method name="ret" c:identifier="gir_test_boxed_struct_ret"> + <return-value transfer-ownership="none"> + <type name="none" c:type="void"/> + </return-value> + <parameters> + <instance-parameter name="self" transfer-ownership="none" nullable="1"> + <type name="GirTest.BoxedStruct" c:type="GirTestBoxedStruct*"/> + </instance-parameter> + <parameter name="result" direction="out" transfer-ownership="full" caller-allocates="1"> + <type name="GirTest.BoxedStruct" c:type="GirTestBoxedStruct*"/> + </parameter> + </parameters> + </method> </record> <record name="Struct" c:type="GirTestStruct" c:symbol-prefix="struct"> <field name="field_name" writable="1"> @@ -2849,6 +2862,19 @@ </instance-parameter> </parameters> </method> + <method name="ret" c:identifier="gir_test_struct_ret"> + <return-value transfer-ownership="none"> + <type name="none" c:type="void"/> + </return-value> + <parameters> + <instance-parameter name="self" transfer-ownership="none" nullable="1"> + <type name="GirTest.Struct" c:type="GirTestStruct*"/> + </instance-parameter> + <parameter name="result" direction="out" transfer-ownership="full" caller-allocates="1"> + <type name="GirTest.Struct" c:type="GirTestStruct*"/> + </parameter> + </parameters> + </method> </record> <record name="SkippedStruct" c:type="GirTestSkippedStruct" c:symbol-prefix="skipped_struct" glib:type-name="GirTestSkippedStruct" glib:get-type="gir_test_skipped_struct_get_type" introspectable="0"> <field name="field_name" writable="1"> @@ -2934,6 +2960,24 @@ <constant name="RENAMED_CONSTANT" c:identifier="GIR_TEST_NAMED_CONSTANT" value="23"> <type name="gint" c:type="gint"/> </constant> + <constant name="TRUE_LITERAL" c:identifier="GIR_TEST_TRUE_LITERAL" value="true"> + <type name="gboolean" c:type="gboolean"/> + </constant> + <constant name="FALSE_LITERAL" c:identifier="GIR_TEST_FALSE_LITERAL" value="false"> + <type name="gboolean" c:type="gboolean"/> + </constant> + <constant name="CHAR_LITERAL" c:identifier="GIR_TEST_CHAR_LITERAL" value="y"> + <type name="gint8" c:type="gchar"/> + </constant> + <constant name="REAL_LITERAL" c:identifier="GIR_TEST_REAL_LITERAL" value="3.1415"> + <type name="gdouble" c:type="gdouble"/> + </constant> + <constant name="FLOAT_LITERAL" c:identifier="GIR_TEST_FLOAT_LITERAL" value="-3.1415f"> + <type name="gfloat" c:type="gfloat"/> + </constant> + <constant name="INTEGER_LITERAL" c:identifier="GIR_TEST_INTEGER_LITERAL" value="-42"> + <type name="gint" c:type="gint"/> + </constant> <function name="use_renamed_class" c:identifier="gir_test_use_renamed_class"> <return-value transfer-ownership="full"> <type name="GirTest.RenamedClass" c:type="GirTestNamedClass*"/> diff --git a/tests/girwriter/girtest.vala b/tests/girwriter/girtest.vala index 116e19c65..82d146ecc 100644 --- a/tests/girwriter/girtest.vala +++ b/tests/girwriter/girtest.vala @@ -14,6 +14,10 @@ namespace GirTest { public void inv () { } + + public BoxedStruct ret () { + return this; + } } [CCode (has_type_id = false)] @@ -31,6 +35,10 @@ namespace GirTest { public void inv () { } + + public Struct ret () { + return this; + } } [GIR (visible = false)] @@ -48,6 +56,13 @@ namespace GirTest { [GIR (name = "RENAMED_CONSTANT")] public const int NAMED_CONSTANT = 23; + public const bool TRUE_LITERAL = true; + public const bool FALSE_LITERAL = false; + public const char CHAR_LITERAL = 'y'; + public const double REAL_LITERAL = 3.1415; + public const float FLOAT_LITERAL = -3.1415f; + public const int INTEGER_LITERAL = -42; + public enum EnumTest { VALUE1, VALUE2, diff --git a/tests/girwriter/girtest.vapi-expected b/tests/girwriter/girtest.vapi-expected index 577414304..0350bd8e6 100644 --- a/tests/girwriter/girtest.vapi-expected +++ b/tests/girwriter/girtest.vapi-expected @@ -176,6 +176,7 @@ namespace GirTest { public BoxedStruct (); public BoxedStruct.foo (int param1, int param2); public void inv (); + public GirTest.BoxedStruct ret (); } [CCode (cheader_filename = "girtest.h")] [GIR (name = "RenamedStruct")] @@ -194,6 +195,7 @@ namespace GirTest { public Struct (); public Struct.foo (int param1, int param2); public void inv (); + public GirTest.Struct ret (); } [CCode (cheader_filename = "girtest.h")] public enum EnumTest { @@ -260,13 +262,25 @@ namespace GirTest { [GIR (visible = false)] public delegate void SkippedDelegate (); [CCode (cheader_filename = "girtest.h")] + public const char CHAR_LITERAL; + [CCode (cheader_filename = "girtest.h")] public const int CONSTANT_NUMBER; [CCode (cheader_filename = "girtest.h")] public const string CONSTANT_STRING; [CCode (cheader_filename = "girtest.h")] + public const bool FALSE_LITERAL; + [CCode (cheader_filename = "girtest.h")] + public const float FLOAT_LITERAL; + [CCode (cheader_filename = "girtest.h")] + public const int INTEGER_LITERAL; + [CCode (cheader_filename = "girtest.h")] [GIR (name = "RENAMED_CONSTANT")] public const int NAMED_CONSTANT; [CCode (cheader_filename = "girtest.h")] + public const double REAL_LITERAL; + [CCode (cheader_filename = "girtest.h")] + public const bool TRUE_LITERAL; + [CCode (cheader_filename = "girtest.h")] public static GirTest.NamedClass use_renamed_class (GirTest.NamedClass param); [CCode (cheader_filename = "girtest.h")] public static unowned GirTest.NamedCompactClass use_renamed_compact_class (GirTest.NamedCompactClass param); diff --git a/tests/girwriter/girtest.vapigen-expected b/tests/girwriter/girtest.vapigen-expected index 61d438058..ad33e3c96 100644 --- a/tests/girwriter/girtest.vapigen-expected +++ b/tests/girwriter/girtest.vapigen-expected @@ -205,6 +205,7 @@ namespace GirTest { public BoxedStruct (); public BoxedStruct.foo (int param1, int param2); public void inv (); + public GirTest.BoxedStruct ret (); } [CCode (cheader_filename = "girtest.h", cname = "GirTestNamedCompactClass", has_type_id = false)] public struct RenamedCompactClass { @@ -220,6 +221,7 @@ namespace GirTest { public Struct (); public Struct.foo (int param1, int param2); public void inv (); + public GirTest.Struct ret (); } [CCode (cheader_filename = "girtest.h", cprefix = "GIR_TEST_ENUM_TEST_", type_id = "gir_test_enum_test_get_type ()")] public enum EnumTest { @@ -267,12 +269,24 @@ namespace GirTest { public delegate bool DelegateTest (void* a, void* b); [CCode (cheader_filename = "girtest.h", cname = "GirTestNamedDelegate", has_target = false)] public delegate void RenamedDelegate (); + [CCode (cheader_filename = "girtest.h", cname = "GIR_TEST_CHAR_LITERAL")] + public const int8 CHAR_LITERAL; [CCode (cheader_filename = "girtest.h", cname = "GIR_TEST_CONSTANT_NUMBER")] public const int CONSTANT_NUMBER; [CCode (cheader_filename = "girtest.h", cname = "GIR_TEST_CONSTANT_STRING")] public const string CONSTANT_STRING; + [CCode (cheader_filename = "girtest.h", cname = "GIR_TEST_FALSE_LITERAL")] + public const bool FALSE_LITERAL; + [CCode (cheader_filename = "girtest.h", cname = "GIR_TEST_FLOAT_LITERAL")] + public const float FLOAT_LITERAL; + [CCode (cheader_filename = "girtest.h", cname = "GIR_TEST_INTEGER_LITERAL")] + public const int INTEGER_LITERAL; + [CCode (cheader_filename = "girtest.h", cname = "GIR_TEST_REAL_LITERAL")] + public const double REAL_LITERAL; [CCode (cheader_filename = "girtest.h", cname = "GIR_TEST_NAMED_CONSTANT")] public const int RENAMED_CONSTANT; + [CCode (cheader_filename = "girtest.h", cname = "GIR_TEST_TRUE_LITERAL")] + public const bool TRUE_LITERAL; [CCode (cheader_filename = "girtest.h")] public static GirTest.RenamedClass use_renamed_class (GirTest.RenamedClass param); [CCode (cheader_filename = "girtest.h")] |