GNOME.org
 

gobject-introspection r903 - in trunk: . tests tests/invoke

Author: otaylor
Date: Wed Nov 12 17:16:55 2008
New Revision: 903
URL: http://svn.gnome.org/viewvc/gobject-introspection?rev=903&view=rev

Log:
Fix mismatches between .gir name and 'name' attribute (#560419)

* tests/boxed.gir tests/constant.gir tests/enum.gir tests/invoke/invoke.c
tests/invoke/testfns-1.0.gir tests/object.gir tests/struct.gir: Fix places
where the 'name' element of <namespace/> didn't match the filename of the
gir, an assumption that the compiler has always expected and now enforces.

Modified:
   trunk/ChangeLog
   trunk/tests/boxed.gir
   trunk/tests/constant.gir
   trunk/tests/enum.gir
   trunk/tests/invoke/invoke.c
   trunk/tests/invoke/testfns-1.0.gir
   trunk/tests/object.gir
   trunk/tests/struct.gir

Modified: trunk/tests/boxed.gir
==============================================================================
--- trunk/tests/boxed.gir	(original)
+++ trunk/tests/boxed.gir	Wed Nov 12 17:16:55 2008
@@ -3,7 +3,7 @@
             xmlns="http://www.gtk.org/introspection/core/1.0";
             xmlns:c="http://www.gtk.org/introspection/c/1.0";
             xmlns:glib="http://www.gtk.org/introspection/glib/1.0";>
-  <namespace name="Foo" version="1.0">
+  <namespace name="boxed" version="1.0">
     <glib:boxed glib:name="BoxedType1" glib:type-name="boxed1" glib:get-type="boxed1_get_type" deprecated="1">
       <field name="field1" writable="1">
         <type name="uint32"/>

Modified: trunk/tests/constant.gir
==============================================================================
--- trunk/tests/constant.gir	(original)
+++ trunk/tests/constant.gir	Wed Nov 12 17:16:55 2008
@@ -3,7 +3,7 @@
             xmlns="http://www.gtk.org/introspection/core/1.0";
             xmlns:c="http://www.gtk.org/introspection/c/1.0";
             xmlns:glib="http://www.gtk.org/introspection/glib/1.0";>
-  <namespace name="Foo" version="1.0">
+  <namespace name="constant" version="1.0">
     <constant name="constant1" value="42">
       <type name="int"/>
     </constant>

Modified: trunk/tests/enum.gir
==============================================================================
--- trunk/tests/enum.gir	(original)
+++ trunk/tests/enum.gir	Wed Nov 12 17:16:55 2008
@@ -3,7 +3,7 @@
             xmlns="http://www.gtk.org/introspection/core/1.0";
             xmlns:c="http://www.gtk.org/introspection/c/1.0";
             xmlns:glib="http://www.gtk.org/introspection/glib/1.0";>
-  <namespace name="Foo" version="1.0">
+  <namespace name="enum" version="1.0">
     <enumeration name="Enum1" glib:type-name="FooEnum" glib:get-type="foo_enum_get_type">
       <member name="value1" value="0"/>
       <member name="value2" value="1"/>

Modified: trunk/tests/invoke/invoke.c
==============================================================================
--- trunk/tests/invoke/invoke.c	(original)
+++ trunk/tests/invoke/invoke.c	Wed Nov 12 17:16:55 2008
@@ -33,7 +33,7 @@
 
   rep = g_irepository_get_default ();
 
-  g_assert (!g_irepository_is_registered (NULL, "test", NULL));
+  g_assert (!g_irepository_is_registered (NULL, "testfns", NULL));
   
   handle = g_module_open (testfns, 0);
   if (!handle)
@@ -42,17 +42,17 @@
       return 1;
     }
 
-  g_assert (g_irepository_is_registered (NULL, "test", NULL));
+  g_assert (g_irepository_is_registered (NULL, "testfns", NULL));
 
   g_print ("after dlopening %s: %d infos in the repository\n", 
 	   testfns,
-	   g_irepository_get_n_infos (rep, "test"));
+	   g_irepository_get_n_infos (rep, "testfns"));
 
   /* test1 calculates x + 4, 
    * taking x as an in parameter
    * and returning the result 
    */
-  info = g_irepository_find_by_name (rep, "test", "test1");  
+  info = g_irepository_find_by_name (rep, "testfns", "test1");  
   g_assert (g_base_info_get_type (info) == GI_INFO_TYPE_FUNCTION);
   function = (GIFunctionInfo *)info;
 
@@ -70,7 +70,7 @@
    * taking x as an in parameter
    * and storing the result in an out parameter
    */
-  info = g_irepository_find_by_name (rep, "test", "test2");  
+  info = g_irepository_find_by_name (rep, "testfns", "test2");  
   g_assert (g_base_info_get_type (info) == GI_INFO_TYPE_FUNCTION);
   function = (GIFunctionInfo *)info;
 
@@ -89,7 +89,7 @@
    * taking x as an inout parameter
    * and storing the result in the same parameter
    */
-  info = g_irepository_find_by_name (rep, "test", "test3");  
+  info = g_irepository_find_by_name (rep, "testfns", "test3");  
   g_assert (g_base_info_get_type (info) == GI_INFO_TYPE_FUNCTION);
   function = (GIFunctionInfo *)info;
 
@@ -105,7 +105,7 @@
 
   /* test4 prints out a string
    */
-  info = g_irepository_find_by_name (rep, "test", "test4");  
+  info = g_irepository_find_by_name (rep, "testfns", "test4");  
   g_assert (g_base_info_get_type (info) == GI_INFO_TYPE_FUNCTION);
   function = (GIFunctionInfo *)info;
 
@@ -119,7 +119,7 @@
 
   /* test5 returns a string and a length
    */
-  info = g_irepository_find_by_name (rep, "test", "test5");  
+  info = g_irepository_find_by_name (rep, "testfns", "test5");  
   g_assert (g_base_info_get_type (info) == GI_INFO_TYPE_FUNCTION);
   function = (GIFunctionInfo *)info;
 
@@ -139,7 +139,7 @@
 
   /* test GList*/
   g_print ("Test 6\n");
-  info = g_irepository_find_by_name (rep, "test", "test6");
+  info = g_irepository_find_by_name (rep, "testfns", "test6");
   g_assert (g_base_info_get_type (info) == GI_INFO_TYPE_FUNCTION);
   function = (GIFunctionInfo *)info;
 
@@ -164,7 +164,7 @@
 
   /* test GList more, transfer ownership*/
   g_print ("Test 7\n");
-  info = g_irepository_find_by_name (rep, "test", "test7");
+  info = g_irepository_find_by_name (rep, "testfns", "test7");
   g_assert (g_base_info_get_type (info) == GI_INFO_TYPE_FUNCTION);
   function = (GIFunctionInfo *)info;
 
@@ -194,7 +194,7 @@
   g_clear_error (&error);
 
   g_print("Test 8\n");
-  info = g_irepository_find_by_name (rep, "test", "TestStruct");
+  info = g_irepository_find_by_name (rep, "testfns", "TestStruct");
   g_assert (g_base_info_get_type (info) == GI_INFO_TYPE_STRUCT);
   record = (GIStructInfo *)info;
   info = g_struct_info_find_method (record, "test8");
@@ -250,7 +250,7 @@
 
 #if 0
   /* "broken" is in the typelib but not in the .so*/
-  info = g_irepository_find_by_name (rep, "test", "broken");  
+  info = g_irepository_find_by_name (rep, "testfns", "broken");  
   g_assert (g_base_info_get_type (info) == GI_INFO_TYPE_FUNCTION);
   function = (GIFunctionInfo *)info;
 
@@ -264,7 +264,7 @@
 #endif
   
   /* too few in arguments */
-  info = g_irepository_find_by_name (rep, "test", "test2");  
+  info = g_irepository_find_by_name (rep, "testfns", "test2");  
   g_assert (g_base_info_get_type (info) == GI_INFO_TYPE_FUNCTION);
   function = (GIFunctionInfo *)info;
 

Modified: trunk/tests/invoke/testfns-1.0.gir
==============================================================================
--- trunk/tests/invoke/testfns-1.0.gir	(original)
+++ trunk/tests/invoke/testfns-1.0.gir	Wed Nov 12 17:16:55 2008
@@ -3,7 +3,7 @@
             xmlns="http://www.gtk.org/introspection/core/1.0";
             xmlns:c="http://www.gtk.org/introspection/c/1.0";
             xmlns:glib="http://www.gtk.org/introspection/glib/1.0";>
-  <namespace name="test" version="1.0">
+  <namespace name="testfns" version="1.0">
     <function name="test1" c:identifier="test1">
       <return-value transfer-ownership="none">
         <type name="int" c:type="gint"/>

Modified: trunk/tests/object.gir
==============================================================================
--- trunk/tests/object.gir	(original)
+++ trunk/tests/object.gir	Wed Nov 12 17:16:55 2008
@@ -4,7 +4,7 @@
             xmlns:c="http://www.gtk.org/introspection/c/1.0";
             xmlns:glib="http://www.gtk.org/introspection/glib/1.0";>
   <include name="GObject" version="2.0"/>
-  <namespace name="Foo" version="1.0">
+  <namespace name="object" version="1.0">
     <interface name="IFace1" glib:type-name="IFace1" glib:get-type="iface1_get_type"/>
     <class name="Object1" parent="Object2" glib:type-name="Object1" glib:get-type="object1_get_type">
       <implements name="IFace1"/>

Modified: trunk/tests/struct.gir
==============================================================================
--- trunk/tests/struct.gir	(original)
+++ trunk/tests/struct.gir	Wed Nov 12 17:16:55 2008
@@ -3,7 +3,7 @@
             xmlns="http://www.gtk.org/introspection/core/1.0";
             xmlns:c="http://www.gtk.org/introspection/c/1.0";
             xmlns:glib="http://www.gtk.org/introspection/glib/1.0";>
-  <namespace name="Foo" version="1.0">
+  <namespace name="struct" version="1.0">
     <record name="FooStruct">
       <field name="foo_int" writable="1">
         <type name="int"/>
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]