[gxml] Fixed bug in GXml.Namespace implementation of old libxml
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gxml] Fixed bug in GXml.Namespace implementation of old libxml
- Date: Wed, 29 Apr 2015 17:04:25 +0000 (UTC)
commit c154022022f5ae93a4df605af394a72d539aaa11
Author: Daniel Espinosa <esodan gmail com>
Date: Wed Apr 29 12:03:40 2015 -0500
Fixed bug in GXml.Namespace implementation of old libxml
gxml/libxml-NamespaceAttr.vala | 4 ++--
gxml/libxml-Node.vala | 2 +-
test/SerializableObjectModelTest.vala | 19 ++++++++++++++-----
3 files changed, 17 insertions(+), 8 deletions(-)
---
diff --git a/gxml/libxml-NamespaceAttr.vala b/gxml/libxml-NamespaceAttr.vala
index f3578e7..3160797 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 0093084..e211c95 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<GXml.Namespace> namespaces { get { return
_namespace_definitions; } }
+ public virtual Gee.BidirList<GXml.Namespace> namespaces { get { return (Gee.BidirList)
namespace_definitions; } }
public virtual Gee.BidirList<GXml.Node> childs { get { return (BidirList<GXml.Node>)
child_nodes; } }
public virtual Gee.Map<string,GXml.Node> attrs { get { return (Map<string,GXml.Node>)
_attributes; } }
public virtual string name { get { return node_name; } }
diff --git a/test/SerializableObjectModelTest.vala b/test/SerializableObjectModelTest.vala
index 7a647f2..584ee74 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 ("""<?xml version="1.0"?>
<Configuration xmlns:om="http://www.gnome.org/gxml/0.4" device="Sampler"/>""");
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 ("""<?xml version="1.0"?><NodeName />""");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]