tests: Actually define SkippedStruct as struct for girwriter

diff --git a/tests/girwriter/GirTest-1.0.gir-expected b/tests/girwriter/GirTest-1.0.gir-expected
index ab8c7f49d96fde659f86c0c0ebafef9fff1acdbd..18ae0bbdc6b7da32c692b5f1815e340841f4c0bb 100644 (file)
--- a/tests/girwriter/GirTest-1.0.gir-expected
+++ b/tests/girwriter/GirTest-1.0.gir-expected
@@ -31,13 +31,6 @@
                <member name="smelly" c:identifier="GIR_TEST_ERROR_TEST_SMELLY" value="1"/>
                <member name="fishy" c:identifier="GIR_TEST_ERROR_TEST_FISHY" value="23"/>
        </enumeration>
-       <record name="SkippedStruct" introspectable="0">
-               <constructor name="new" c:identifier="gir_test_skipped_struct_new">
-                       <return-value transfer-ownership="full">
-                               <type name="GirTest.SkippedStruct" c:type="GirTestSkippedStruct*"/>
-                       </return-value>
-               </constructor>
-       </record>
        <record name="TypeTest">
                <constructor name="new" c:identifier="gir_test_typetest_new">
                        <return-value transfer-ownership="full">
@@ -1140,6 +1133,11 @@
                        </return-value>
                </method>
        </record>
+       <record name="SkippedStruct" c:type="GirTestSkippedStruct" glib:type-name="GirTestSkippedStruct" glib:get-type="gir_test_skipped_struct_get_type" introspectable="0">
+               <field name="field_name">
+                       <type name="gint" c:type="gint"/>
+               </field>
+       </record>
        <callback name="DelegateTest" c:type="GirTestDelegateTest">
                <return-value transfer-ownership="full">
                        <type name="gboolean" c:type="gboolean"/>

diff --git a/tests/girwriter/girtest.vala b/tests/girwriter/girtest.vala
index 9d23113b0282712ff7b722344577124d15701a92..2e7c522bd95fb59c09b12e5c44aa831e1acc70de 100644 (file)
--- a/tests/girwriter/girtest.vala
+++ b/tests/girwriter/girtest.vala
@@ -22,7 +22,8 @@ namespace GirTest {
        }
 
        [GIR (visible = false)]
-       public class SkippedStruct {
+       public struct SkippedStruct {
+               public int field_name;
        }
 
        public const int CONSTANT_NUMBER = 42;

diff --git a/tests/girwriter/girtest.vapi-expected b/tests/girwriter/girtest.vapi-expected
index 809e12cca312414f4363c42990de5312a6f20acc..0b6e574a7e726e315c2e22b822ae47f499fdf661 100644 (file)
--- a/tests/girwriter/girtest.vapi-expected
+++ b/tests/girwriter/girtest.vapi-expected
@@ -76,11 +76,6 @@ namespace GirTest {
                public SkippedClass ();
        }
        [CCode (cheader_filename = "girtest.h")]
-       [GIR (visible = false)]
-       public class SkippedStruct {
-               public SkippedStruct ();
-       }
-       [CCode (cheader_filename = "girtest.h")]
        public class TypeTest {
                public TypeTest ();
                public string some_property { get; set; }
@@ -104,6 +99,11 @@ namespace GirTest {
                public BoxedStruct ();
                public void inv ();
        }
+       [CCode (cheader_filename = "girtest.h")]
+       [GIR (visible = false)]
+       public struct SkippedStruct {
+               public int field_name;
+       }
        [CCode (cheader_filename = "girtest.h", has_type_id = false)]
        public struct Struct {
                public int field_name;