tests/girwriter: Use the actual expected output of our girwriter

diff --git a/tests/girwriter/class-final.test b/tests/girwriter/class-final.test
index 00b50022d3a9ff7365a1c63004d32cf4c69473e8..e92739ebe8f9aa34f8525c63690f4bd63d5c29f9 100644 (file)
--- a/tests/girwriter/class-final.test
+++ b/tests/girwriter/class-final.test
@@ -13,45 +13,45 @@ Output:
 <package name="test"/>
 <c:include name="test.h"/>
 <namespace name="Test" version="1.2" c:prefix="Test" c:identifier-prefixes="Test" c:symbol-prefixes="test">
-  <class name="TestFoo" c:type="TestTestFoo" c:symbol-prefix="foo" glib:type-name="TestTestFoo" glib:get-type="test_test_foo_get_type" glib:type-struct="TestFooClass" glib:fundamental="1" glib:ref-func="test_test_foo_ref" glib:unref-func="test_test_foo_unref" glib:set-value-func="test_test_value_set_foo" glib:get-value-func="test_test_value_get_foo">
-    <field name="parent_instance" readable="0" private="1">
-      <type name="GObject.TypeInstance" c:type="GTypeInstance"/>
-    </field>
-    <field name="ref_count">
-      <type name="gint" c:type="volatile int"/>
-    </field>
-    <field name="priv" readable="0" private="1">
-      <type name="TestFooPrivate" c:type="TestTestFooPrivate*"/>
-    </field>
-    <constructor name="new" c:identifier="test_test_foo_new">
-      <return-value transfer-ownership="full">
-        <type name="Test.Foo" c:type="TestTestFoo*"/>
-      </return-value>
-    </constructor>
-  </class>
-  <record name="TestFooClass" c:type="TestTestFooClass" glib:is-gtype-struct-for="TestFoo">
-    <field name="parent_class" readable="0" private="1">
-      <type name="GObject.TypeClass" c:type="GTypeClass"/>
-    </field>
-  </record>
-  <record name="TestFooPrivate" c:type="TestTestFooPrivate" disguised="1"/>
-  <class name="TestBar" c:type="TestTestBar" c:symbol-prefix="bar" glib:type-name="TestTestBar" glib:get-type="test_test_bar_get_type" glib:type-struct="TestBarClass" parent="Test.Foo" final="1">
-    <field name="parent_instance" readable="0" private="1">
-      <type name="Test.Foo" c:type="TestTestFoo"/>
-    </field>
-    <field name="priv" readable="0" private="1">
-      <type name="TestBarPrivate" c:type="TestTestBarPrivate*"/>
-    </field>
-    <constructor name="new" c:identifier="test_test_bar_new">
-      <return-value transfer-ownership="full">
-        <type name="Test.Bar" c:type="TestTestBar*"/>
-      </return-value>
-    </constructor>
-  </class>
-  <record name="TestBarClass" c:type="TestTestBarClass" glib:is-gtype-struct-for="TestBar">
-    <field name="parent_class" readable="0" private="1">
-      <type name="Test.FooClass" c:type="TestTestFooClass"/>
-    </field>
-  </record>
-  <record name="TestBarPrivate" c:type="TestTestBarPrivate" disguised="1"/>
+       <class name="TestFoo" c:type="TestTestFoo" c:symbol-prefix="foo" glib:type-name="TestTestFoo" glib:get-type="test_test_foo_get_type" glib:type-struct="TestFooClass" glib:fundamental="1" glib:ref-func="test_test_foo_ref" glib:unref-func="test_test_foo_unref" glib:set-value-func="test_test_value_set_foo" glib:get-value-func="test_test_value_get_foo">
+               <field name="parent_instance" readable="0" private="1">
+                       <type name="GObject.TypeInstance" c:type="GTypeInstance"/>
+               </field>
+               <field name="ref_count">
+                       <type name="gint" c:type="volatile int"/>
+               </field>
+               <field name="priv" readable="0" private="1">
+                       <type name="TestFooPrivate" c:type="TestTestFooPrivate*"/>
+               </field>
+               <constructor name="new" c:identifier="test_test_foo_new">
+                       <return-value transfer-ownership="full">
+                               <type name="Test.Foo" c:type="TestTestFoo*"/>
+                       </return-value>
+               </constructor>
+       </class>
+       <record name="TestFooClass" c:type="TestTestFooClass" glib:is-gtype-struct-for="TestFoo">
+               <field name="parent_class" readable="0" private="1">
+                       <type name="GObject.TypeClass" c:type="GTypeClass"/>
+               </field>
+       </record>
+       <record name="TestFooPrivate" c:type="TestTestFooPrivate" disguised="1"/>
+       <class name="TestBar" c:type="TestTestBar" c:symbol-prefix="bar" glib:type-name="TestTestBar" glib:get-type="test_test_bar_get_type" glib:type-struct="TestBarClass" parent="Test.Foo" final="1">
+               <field name="parent_instance" readable="0" private="1">
+                       <type name="Test.Foo" c:type="TestTestFoo"/>
+               </field>
+               <field name="priv" readable="0" private="1">
+                       <type name="TestBarPrivate" c:type="TestTestBarPrivate*"/>
+               </field>
+               <constructor name="new" c:identifier="test_test_bar_new">
+                       <return-value transfer-ownership="full">
+                               <type name="Test.Bar" c:type="TestTestBar*"/>
+                       </return-value>
+               </constructor>
+       </class>
+       <record name="TestBarClass" c:type="TestTestBarClass" glib:is-gtype-struct-for="TestBar">
+               <field name="parent_class" readable="0" private="1">
+                       <type name="Test.FooClass" c:type="TestTestFooClass"/>
+               </field>
+       </record>
+       <record name="TestBarPrivate" c:type="TestTestBarPrivate" disguised="1"/>
 </namespace>

diff --git a/tests/girwriter/combined.test b/tests/girwriter/combined.test
index a56f26adaa2972bde061799b820c9e0ef15fc4ad..8d4e267cac121350b7ea96e8e6878b82068e52b7 100644 (file)
--- a/tests/girwriter/combined.test
+++ b/tests/girwriter/combined.test
@@ -21,34 +21,34 @@ Output:
 <package name="test"/>
 <c:include name="test.h"/>
 <namespace name="Test" version="1.2" c:prefix="Test" c:identifier-prefixes="Test" c:symbol-prefixes="test">
-  <function name="use_combined_foo" c:identifier="test_use_combined_foo">
-    <return-value transfer-ownership="full">
-      <type name="Foo.Test" c:type="FooTest*"/>
-    </return-value>
-    <parameters>
-      <parameter name="param" transfer-ownership="none">
-        <type name="Foo.Test" c:type="FooTest*"/>
-      </parameter>
-    </parameters>
-  </function>
-  <function name="use_combined_bar" c:identifier="test_use_combined_bar">
-    <return-value transfer-ownership="full">
-      <type name="Bar.Test" c:type="BarTest*"/>
-    </return-value>
-    <parameters>
-      <parameter name="param" transfer-ownership="none">
-        <type name="Bar.Test" c:type="BarTest*"/>
-      </parameter>
-    </parameters>
-  </function>
-  <function name="use_combined_manam" c:identifier="test_use_combined_manam">
-    <return-value transfer-ownership="full">
-      <type name="Manam.Test" c:type="ManamTest*"/>
-    </return-value>
-    <parameters>
-      <parameter name="param" transfer-ownership="none">
-        <type name="Manam.Test" c:type="ManamTest*"/>
-      </parameter>
-    </parameters>
-  </function>
+       <function name="use_combined_foo" c:identifier="test_use_combined_foo">
+               <return-value transfer-ownership="full">
+                       <type name="Foo.Test" c:type="FooTest*"/>
+               </return-value>
+               <parameters>
+                       <parameter name="param" transfer-ownership="none">
+                               <type name="Foo.Test" c:type="FooTest*"/>
+                       </parameter>
+               </parameters>
+       </function>
+       <function name="use_combined_bar" c:identifier="test_use_combined_bar">
+               <return-value transfer-ownership="full">
+                       <type name="Bar.Test" c:type="BarTest*"/>
+               </return-value>
+               <parameters>
+                       <parameter name="param" transfer-ownership="none">
+                               <type name="Bar.Test" c:type="BarTest*"/>
+                       </parameter>
+               </parameters>
+       </function>
+       <function name="use_combined_manam" c:identifier="test_use_combined_manam">
+               <return-value transfer-ownership="full">
+                       <type name="Manam.Test" c:type="ManamTest*"/>
+               </return-value>
+               <parameters>
+                       <parameter name="param" transfer-ownership="none">
+                               <type name="Manam.Test" c:type="ManamTest*"/>
+                       </parameter>
+               </parameters>
+       </function>
 </namespace>