gobject-introspection r380 - trunk/tests

[johan svn gnome org]

Author: johan
Date: Thu Aug 14 20:22:58 2008
New Revision: 380
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=380&view=rev

Log:
Convert two more tests, still not completely done though

Modified:
   trunk/tests/Makefile.am
   trunk/tests/xref1.gir
   trunk/tests/xref2.gir

Modified: trunk/tests/Makefile.am
==============================================================================
--- trunk/tests/Makefile.am	(original)
+++ trunk/tests/Makefile.am	Thu Aug 14 20:22:58 2008
@@ -26,7 +26,7 @@
 %.gir.test: %.gir
 	@echo Testing $<:
 	$(top_builddir)/tools/g-ir-compiler --raw $< > $<.1; \
-	$(top_builddir)/tools/g-ir-generate --raw $<.1 > $<.2; \ 
+	$(top_builddir)/tools/g-ir-generate --raw $<.1 > $<.2; \
 	diff -u $< $<.2; rm $<.1 $<.2
 
 check-local: $(GIRTESTS)

Modified: trunk/tests/xref1.gir
==============================================================================
--- trunk/tests/xref1.gir	(original)
+++ trunk/tests/xref1.gir	Thu Aug 14 20:22:58 2008
@@ -4,12 +4,16 @@
             xmlns:c="http://www.gtk.org/introspection/c/1.0";
             xmlns:glib="http://www.gtk.org/introspection/glib/1.0";>
   <namespace name="Foo">
-    <boxed name="Boxed" type-name="FooBoxed" get-type="foo_boxed_get_type">
-    </boxed>
+    <glib:boxed glib:name="Boxed" glib:type-name="FooBoxed" glib:get-type="foo_boxed_get_type">
+    </glib:boxed>
     <function name="test" symbol="foo_test">
-      <return-type type="void" />
+      <return-value>
+	<type name="none"/>
+      </return-value>
       <parameters>
-        <parameter name="p1" type="Bar.Boxed*" transfer="full" direction="in" />
+        <parameter name="p1" transfer="full" direction="in">
+	  <type name="Bar.Boxed*"/>
+        </parameter>
       </parameters>
     </function>
   </namespace>

Modified: trunk/tests/xref2.gir
==============================================================================
--- trunk/tests/xref2.gir	(original)
+++ trunk/tests/xref2.gir	Thu Aug 14 20:22:58 2008
@@ -4,12 +4,16 @@
             xmlns:c="http://www.gtk.org/introspection/c/1.0";
             xmlns:glib="http://www.gtk.org/introspection/glib/1.0";>
   <namespace name="Bar">
-    <boxed name="Boxed" type-name="BarBoxed" get-type="bar_boxed_get_type">
-    </boxed>
+    <glib:boxed glib:name="Boxed" glib:type-name="BarBoxed" glib:get-type="bar_boxed_get_type">
+    </glib:boxed>
     <function name="test" symbol="bar_test">
-      <return-type type="void" />
+      <return-value>
+	<type name="none"/>
+      </return-value>
       <parameters>
-        <parameter name="p1" type="Foo.Boxed*" transfer="full" direction="in" />
+        <parameter name="p1" transfer="full" direction="in">
+	  <type name="Foo.Boxed*"/>
+        </parameter>
       </parameters>
     </function>
   </namespace>