diff --git a/gxml/libxml-NamespaceAttr.vala b/gxml/libxml-NamespaceAttr.vala index f3578e70f5d3a9cc5d452a1a385a429f0bf120d2..3160797e3e39778edf73ab67910dab51c34fbd9c 100644 --- a/gxml/libxml-NamespaceAttr.vala +++ b/gxml/libxml-NamespaceAttr.vala @@ -124,12 +124,12 @@ namespace GXml { // GXml.Namespace interface implementations public string uri { get { - return namespace_uri; + return defined_namespace_uri; } } public string prefix { get { - return namespace_prefix; + return defined_prefix; } } } diff --git a/gxml/libxml-Node.vala b/gxml/libxml-Node.vala index 00930849a1d05932852625b0e5ac277c46f22644..e211c95b8a942592a6753e14c6908a9c76028fdf 100644 --- a/gxml/libxml-Node.vala +++ b/gxml/libxml-Node.vala @@ -502,7 +502,7 @@ namespace GXml { } // GXml.Node interface implementations - public virtual Gee.BidirList namespaces { get { return _namespace_definitions; } } + public virtual Gee.BidirList namespaces { get { return (Gee.BidirList) namespace_definitions; } } public virtual Gee.BidirList childs { get { return (BidirList) child_nodes; } } public virtual Gee.Map attrs { get { return (Map) _attributes; } } public virtual string name { get { return node_name; } } diff --git a/test/SerializableObjectModelTest.vala b/test/SerializableObjectModelTest.vala index 7a647f22ccbbfe477c5a3462cb0bd69da62be4e6..584ee74864dfcbfb74d85b096e30567f04fb5cfc 100644 --- a/test/SerializableObjectModelTest.vala +++ b/test/SerializableObjectModelTest.vala @@ -253,8 +253,10 @@ class Configuration : ObjectModel n = node; foreach (GXml.Namespace ns in n.namespaces) { - //stdout.printf (@"Namespace = $(ns.node_value)"); - if (ns.prefix == "om" && ns.prefix == "http://www.gnome.org/gxml/0.4") +#if DEBUG + GLib.message (@"Namespace = $(ns.prefix):$(ns.uri)"); +#endif + if (ns.prefix == "om" && ns.uri == "http://www.gnome.org/gxml/0.4") invalid = false; } return default_deserialize (node); @@ -729,20 +731,27 @@ class SerializableObjectModelTest : GXmlTest stdout.printf (@"Error: $(e.message)"); assert_not_reached (); } - });/* + }); Test.add_func ("/gxml/serializable/object_model/override_deserialize", () => { var doc = new xDocument.from_string (""" """); var configuration = new Configuration (); try { - //stdout.printf (@"$doc"); +#if DEBUG + GLib.message ("Deserializing doc..."); +#endif configuration.deserialize (doc); +#if DEBUG + GLib.message ("Verifing Configuration..."); +#endif if (configuration.invalid == true) { +#if DEBUG stdout.printf ("CONFIGURATION: deserialize is INVALID\n"); foreach (GXml.xNode n in doc.document_element.namespace_definitions) { stdout.printf (@"CONFIGURATION: namespace: $(n.node_value)\n"); } +#endif assert_not_reached (); } } @@ -750,7 +759,7 @@ class SerializableObjectModelTest : GXmlTest stdout.printf (@"Error: $(e.message)"); assert_not_reached (); } - });*/ + }); Test.add_func ("/gxml/serializable/object_model/custome_node_name", () => { var doc = new xDocument.from_string ("""""");