tests/girwriter: Increase coverage

diff --git a/tests/girwriter/GirTest-1.0.gir-expected b/tests/girwriter/GirTest-1.0.gir-expected
index d7f9b8507cb9ebe180f45ca1612c97fb4abf7cba..0630afb6d096c79ab58b0debaae20ce62497cfc8 100644 (file)
--- a/tests/girwriter/GirTest-1.0.gir-expected
+++ b/tests/girwriter/GirTest-1.0.gir-expected
@@ -2770,6 +2770,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" allow-none="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">
@@ -2798,6 +2811,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" allow-none="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">
@@ -2883,6 +2909,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 e495c76b00d8a23cdb4e5c5bb1de959bb1280260..69ed5570a3650946709652c760808deaa1289cc9 100644 (file)
--- a/tests/girwriter/girtest.vala
+++ b/tests/girwriter/girtest.vala
@@ -9,6 +9,10 @@ namespace GirTest {
 
                public void inv () {
                }
+
+               public BoxedStruct ret () {
+                       return this;
+               }
        }
 
        [CCode (has_type_id = false)]
@@ -21,6 +25,10 @@ namespace GirTest {
 
                public void inv () {
                }
+
+               public Struct ret () {
+                       return this;
+               }
        }
 
        [GIR (visible = false)]
@@ -38,6 +46,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 cfd250046b8fb2e3991860c9253214fc8da03976..da6067908e32adbf92f908b087c3f67c16d9ffbe 100644 (file)
--- a/tests/girwriter/girtest.vapi-expected
+++ b/tests/girwriter/girtest.vapi-expected
@@ -171,6 +171,7 @@ namespace GirTest {
                public int internal_field_name;
                public BoxedStruct ();
                public void inv ();
+               public GirTest.BoxedStruct ret ();
        }
        [CCode (cheader_filename = "girtest.h")]
        [GIR (name = "RenamedStruct")]
@@ -188,6 +189,7 @@ namespace GirTest {
                public int internal_field_name;
                public Struct ();
                public void inv ();
+               public GirTest.Struct ret ();
        }
        [CCode (cheader_filename = "girtest.h")]
        public enum EnumTest {
@@ -254,13 +256,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 fa4eae1fd8d1beb74b9f8c9689a88db94d1160f7..2e92479d1533a87002c8730238ed9b3c4ef3086b 100644 (file)
--- a/tests/girwriter/girtest.vapigen-expected
+++ b/tests/girwriter/girtest.vapigen-expected
@@ -198,6 +198,7 @@ namespace GirTest {
                public int field_name;
                public int internal_field_name;
                public void inv ();
+               public GirTest.BoxedStruct ret ();
        }
        [CCode (cheader_filename = "girtest.h", cname = "GirTestNamedCompactClass", has_type_id = false)]
        public struct RenamedCompactClass {
@@ -211,6 +212,7 @@ namespace GirTest {
                public int field_name;
                public int internal_field_name;
                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 {
@@ -258,12 +260,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")]