Fix test cases

11 files changed, 57 insertions, 54 deletions

diff --git a/ChangeLog b/ChangeLog
index 8cd0400b..50c366bb 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,8 @@
 2005-05-12  Matthias Clasen  <mclasen@redhat.com>
 
+	* tests/*: Make tests work with the changes in name
+	handling.
+	
 	* src/gidlnode.c (find_entry_node): Parse qualified
 	names and generate xref nodes for them if needed. Don't
 	require all modules to be loaded any more.
diff --git a/tests/array.test b/tests/array.test
index 9d554733..339c25b7 100644
--- a/tests/array.test
+++ b/tests/array.test
@@ -1,21 +1,21 @@
 <?xml version="1.0"?>
 <api version="1.0">
   <namespace name="Foo">
-    <function name="Foo.test1" symbol="test1">
+    <function name="test1" symbol="test1">
       <return-type type="gboolean"/>
       <parameters>
         <parameter name="p1" type="gchar*[length=1,zero-terminated=1]" direction="in"/>
         <parameter name="p2" type="gint" direction="in"/>
       </parameters>
     </function>
-    <function name="Foo.test2" symbol="test2">
+    <function name="test2" symbol="test2">
       <return-type type="gboolean"/>
       <parameters>
         <parameter name="p2" type="gint" direction="out"/>
         <parameter name="p1" type="gchar*[length=0]" direction="out"/>
       </parameters>
     </function>
-    <function name="Foo.test3" symbol="test3">
+    <function name="test3" symbol="test3">
       <return-type type="gboolean"/>
       <parameters>
         <parameter name="p1" type="gchar*[zero-terminated=1]" direction="in"/>
diff --git a/tests/boxed.test b/tests/boxed.test
index b64ec072..a07e60e7 100644
--- a/tests/boxed.test
+++ b/tests/boxed.test
@@ -1,33 +1,33 @@
 <?xml version="1.0"?>
 <api version="1.0">
   <namespace name="Foo">
-    <boxed name="Foo.boxed1" type-name="BoxedType1" get-type="boxed1_get_type" deprecated="1">
+    <boxed name="boxed1" type-name="BoxedType1" get-type="boxed1_get_type" deprecated="1">
       <field name="field1" readable="1" writable="1" offset="0" type="guint32" />
-      <method name="Foo.boxed1.frob_boxed1" symbol="frob_boxed1">
+      <method name="frob_boxed1" symbol="frob_boxed1">
         <return-type type="void"/>
         <parameters>
-          <parameter name="box" type="Foo.boxed1*" direction="in"/>
-          <parameter name="w" type="GList<Foo.boxed2*>" direction="in"/>
+          <parameter name="box" type="boxed1*" direction="in"/>
+          <parameter name="w" type="GList<boxed2*>" direction="in"/>
           <parameter name="t" type="GHashTable<gchar*,gint64>" direction="in"/>
           <parameter name="e" type="GError<>" direction="out"/>
         </parameters>
       </method>
-      <method name="Foo.boxed1.lart" symbol="lart">
+      <method name="lart" symbol="lart">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="box" type="Foo.boxed2*" direction="in"/>
+          <parameter name="box" type="boxed2*" direction="in"/>
           <parameter name="val" type="gint*" direction="inout"/>
         </parameters>
       </method>
     </boxed>
-    <function name="Foo.freefunc" symbol="freefunc" deprecated="1">
+    <function name="freefunc" symbol="freefunc" deprecated="1">
       <return-type type="gint"/>
       <parameters>
         <parameter name="v1" type="gint" direction="in"/>
         <parameter name="val2" type="gint" direction="in"/>
       </parameters>
     </function>
-    <boxed name="Foo.boxed2" type-name="BoxedType2" get-type="boxed2_get_type" deprecated="1">
+    <boxed name="boxed2" type-name="BoxedType2" get-type="boxed2_get_type" deprecated="1">
     </boxed>
   </namespace>
 </api>
diff --git a/tests/enum.test b/tests/enum.test
index f488d20c..1e056248 100644
--- a/tests/enum.test
+++ b/tests/enum.test
@@ -1,17 +1,17 @@
 <?xml version="1.0"?>
 <api version="1.0">
   <namespace name="Foo">
-    <enum name="Foo.Enum1" type-name="FooEnum" get-type="foo_enum_get_type">
+    <enum name="Enum1" type-name="FooEnum" get-type="foo_enum_get_type">
       <member name="value1" value="0" />
       <member name="value2" value="1" />
       <member name="value3" value="2" />
     </enum>
-    <flags name="Foo.Flags1" type-name="FooFlags" get-type="foo_flags_get_type">
+    <flags name="Flags1" type-name="FooFlags" get-type="foo_flags_get_type">
       <member name="value1" value="1" />
       <member name="value2" value="2" />
       <member name="value3" value="4" />
     </flags>
-    <enum name="Foo.Enum2">
+    <enum name="Enum2">
       <member name="value1" value="0" />
       <member name="value2" value="1" />
       <member name="value3" value="2" />
diff --git a/tests/errors.test b/tests/errors.test
index 94e4db79..db860a94 100644
--- a/tests/errors.test
+++ b/tests/errors.test
@@ -1,21 +1,21 @@
 <?xml version="1.0"?>
 <api version="1.0">
   <namespace name="Foo">
-    <enum name="Foo.ErrorCodes1" type-name="ErrorCodes1" get-type="foo_error_codes1_get_type">
-      <member name="Foo.ErrorCodes1.e1" value="0" />
-      <member name="Foo.ErrorCodes1.e2" value="1" deprecated="1" />
-      <member name="Foo.ErrorCodes1.e3" value="2" />
+    <enum name="ErrorCodes1" type-name="ErrorCodes1" get-type="foo_error_codes1_get_type">
+      <member name="e1" value="0" />
+      <member name="e2" value="1" deprecated="1" />
+      <member name="e3" value="2" />
     </enum>
-    <enum name="Foo.ErrorCodes2" type-name="ErrorCodes2" get-type="foo_error_codes2_get_type">
-      <member name="Foo.ErrorCodes2.e1" value="0" />
+    <enum name="ErrorCodes2" type-name="ErrorCodes2" get-type="foo_error_codes2_get_type">
+      <member name="e1" value="0" />
     </enum>
-    <errordomain name="Foo.Errors1" get-quark="foo_errors1_get_quark" codes="Foo.ErrorCodes1" />
-    <errordomain name="Foo.Errors2" get-quark="foo_errors2_get_quark" codes="Foo.ErrorCodes2" />
-    <function name="Foo.test1" symbol="test1">
+    <errordomain name="Errors1" get-quark="foo_errors1_get_quark" codes="ErrorCodes1" />
+    <errordomain name="Errors2" get-quark="foo_errors2_get_quark" codes="ErrorCodes2" />
+    <function name="test1" symbol="test1">
       <return-type type="gboolean"/>
       <parameters>
         <parameter name="p1" type="gint" direction="in" null-ok="1"/>
-        <parameter name="p2" type="GError<Foo.Errors1,Foo.Errors2>" direction="out"/>
+        <parameter name="p2" type="GError<Errors1,Errors2>" direction="out"/>
       </parameters>
     </function>
   </namespace>
diff --git a/tests/function.test b/tests/function.test
index d1328e32..a426e0c1 100644
--- a/tests/function.test
+++ b/tests/function.test
@@ -1,19 +1,19 @@
 <?xml version="1.0"?>
 <api version="1.0">
   <namespace name="Foo">
-    <boxed name="Foo.Boxed1" type-name="Boxed1" get-type="boxed1_get_type">
+    <boxed name="Boxed1" type-name="Boxed1" get-type="boxed1_get_type">
     </boxed>
-    <function name="Foo.test1" symbol="test1" deprecated="1">
+    <function name="test1" symbol="test1" deprecated="1">
       <return-type type="gboolean"/>
       <parameters>
-        <parameter name="p1" type="Foo.Boxed1*" direction="in" null-ok="1"/>
+        <parameter name="p1" type="Boxed1*" direction="in" null-ok="1"/>
         <parameter name="p2" type="gboolean" direction="out"/>
       </parameters>
     </function>
-    <callback name="Foo.callback1" deprecated="1">
+    <callback name="callback1" deprecated="1">
       <return-type type="gboolean"/>
       <parameters>
-        <parameter name="p1" type="Foo.Boxed1*" direction="in" null-ok="1"/>
+        <parameter name="p1" type="Boxed1*" direction="in" null-ok="1"/>
         <parameter name="p2" type="gboolean" direction="out"/>
       </parameters>
     </callback>
diff --git a/tests/gobject.test b/tests/gobject.test
index 9728eba7..4715e26a 100644
--- a/tests/gobject.test
+++ b/tests/gobject.test
@@ -1,7 +1,7 @@
 <?xml version="1.0"?>
 <api version="1.0">
   <namespace name="GObject">
-    <object name="GObject.GObject" type-name="GObject" get-type="g_object_get_type">
+    <object name="GObject" type-name="GObject" get-type="g_object_get_type">
     </object>
   </namespace>
 </api>
diff --git a/tests/interface.test b/tests/interface.test
index 9be2b5c7..40ba6b5f 100644
--- a/tests/interface.test
+++ b/tests/interface.test
@@ -1,38 +1,38 @@
 <?xml version="1.0"?>
 <api version="1.0">
   <namespace name="Foo">
-    <interface name="Foo.Iface1" type-name="Iface1" get-type="iface1_get_type">
+    <interface name="Iface1" type-name="Iface1" get-type="iface1_get_type">
       <requires>
-      <interface name="Foo.Iface2" />
+      <interface name="Iface2" />
       </requires>
-      <method name="Foo.Iface1.method1" symbol="method1">
-        <return-type type="Foo.Iface2*"/>
+      <method name="method1" symbol="method1">
+        <return-type type="Iface2*" transfer="full"/>
         <parameters>
-          <parameter name="param1" type="Foo.Iface2*" direction="in"/>
+          <parameter name="param1" type="Iface2*" direction="in"/>
         </parameters>
       </method>
       <property name="prop1" readable="0" writable="0" type="gint"/>
       <signal name="signal1" when="LAST">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="obj" type="Foo.Iface1*" direction="in"/>
+          <parameter name="obj" type="Iface1*" direction="in"/>
         </parameters>
       </signal>
       <signal name="signal2" when="FIRST" no-recurse="1" detailed="1" action="1" no-hooks="1">
         <return-type type="void"/>
         <parameters>
-          <parameter name="obj" type="Foo.Iface1*" direction="in"/>
+          <parameter name="obj" type="Iface1*" direction="in"/>
         </parameters>
       </signal>
-      <vfunc name="Foo.Iface1.vfunc1">
-        <return-type type="Foo.Iface2*"/>
+      <vfunc name="vfunc1">
+        <return-type type="Iface2*" transfer="full"/>
         <parameters>
-          <parameter name="param1" type="Foo.Iface2*" direction="in"/>
+          <parameter name="param1" type="Iface2*" direction="in"/>
         </parameters>
       </vfunc>
       <constant name="constant1" type="gint" value="42" />
     </interface>
-    <interface name="Foo.Iface2" type-name="Iface2" get-type="iface2_get_type">
+    <interface name="Iface2" type-name="Iface2" get-type="iface2_get_type">
     </interface>
   </namespace>
 </api>
diff --git a/tests/object.test b/tests/object.test
index 33600103..8055af75 100644
--- a/tests/object.test
+++ b/tests/object.test
@@ -1,34 +1,34 @@
 <?xml version="1.0"?>
 <api version="1.0">
   <namespace name="Foo">
-    <object name="Foo.Object1" parent="Foo.Object2" type-name="Object1" get-type="object1_get_type">
+    <object name="Object1" parent="Object2" type-name="Object1" get-type="object1_get_type">
       <implements>
-      <interface name="Foo.Iface1" />
+        <interface name="Iface1" />
       </implements>
       <property name="prop1" readable="0" writable="0" type="gint"/>
       <signal name="signal1" when="LAST">
         <return-type type="gboolean"/>
         <parameters>
-          <parameter name="obj" type="Foo.Object1*" direction="in"/>
+          <parameter name="obj" type="Object1*" direction="in"/>
         </parameters>
       </signal>
       <signal name="signal2" when="FIRST" no-recurse="1" detailed="1" action="1" no-hooks="1">
         <return-type type="void"/>
         <parameters>
-          <parameter name="obj" type="Foo.Object1*" direction="in"/>
+          <parameter name="obj" type="Object1*" direction="in"/>
         </parameters>
       </signal>
-      <vfunc name="Foo.Object1.vfunc1">
-        <return-type type="Foo.Object2*"/>
+      <vfunc name="vfunc1">
+        <return-type type="Object2*" transfer="full"/>
         <parameters>
-          <parameter name="param1" type="Foo.Object1*" direction="in"/>
+          <parameter name="param1" type="Object1*" direction="in"/>
         </parameters>
       </vfunc>
       <constant name="constant1" type="gint" value="42" />
     </object>
-    <interface name="Foo.Iface1" type-name="Iface1" get-type="iface1_get_type">
+    <interface name="Iface1" type-name="Iface1" get-type="iface1_get_type">
     </interface>
-    <object name="Foo.Object2" parent="GObject.GObject" type-name="Object2" get-type="object2_get_type">
+    <object name="Object2" parent="GObject.GObject" type-name="Object2" get-type="object2_get_type">
     </object>
   </namespace>
 </api>
diff --git a/tests/xref1.test b/tests/xref1.test
index b065d8c0..69d04f19 100644
--- a/tests/xref1.test
+++ b/tests/xref1.test
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <api version="1.0">
   <namespace name="Foo">
-    <boxed name="Foo.Boxed" type-name="FooBoxed" get-type="foo_boxed_get_type">
+    <boxed name="Boxed" type-name="FooBoxed" get-type="foo_boxed_get_type">
     </boxed>
-    <function name="Foo.test" symbol="foo_test">
+    <function name="test" symbol="foo_test">
       <return-type type="void"/>
       <parameters>
         <parameter name="p1" type="Bar.Boxed*" direction="in"/>
diff --git a/tests/xref2.test b/tests/xref2.test
index c6380242..a4a786e1 100644
--- a/tests/xref2.test
+++ b/tests/xref2.test
@@ -1,9 +1,9 @@
 <?xml version="1.0"?>
 <api version="1.0">
   <namespace name="Bar">
-    <boxed name="Bar.Boxed" type-name="BarBoxed" get-type="bar_boxed_get_type">
+    <boxed name="Boxed" type-name="BarBoxed" get-type="bar_boxed_get_type">
     </boxed>
-    <function name="Bar.test" symbol="bar_test">
+    <function name="test" symbol="bar_test">
       <return-type type="void"/>
       <parameters>
         <parameter name="p1" type="Foo.Boxed*" direction="in"/>