[gxml] Removing xDocument for GDocument on Serializable Tests
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gxml] Removing xDocument for GDocument on Serializable Tests
- Date: Wed, 10 Feb 2016 20:50:52 +0000 (UTC)
commit a98b9a8a60a0f4af58019935e3258413376a0182
Author: Daniel Espinosa <esodan gmail com>
Date: Wed Feb 10 10:54:29 2016 -0600
Removing xDocument for GDocument on Serializable Tests
configure.ac | 2 +-
test/SerializableBasicTypesTest.vala | 58 ++++----
test/SerializableGeeArrayListTest.vala | 10 +-
test/SerializableGeeCollections-Tw-Test.vala | 8 +-
test/SerializableGeeCollectionsTest.vala | 83 +++++-----
test/SerializableGeeDualKeyMapTest.vala | 16 +-
test/SerializableGeeHashMapTest.vala | 10 +-
test/SerializableGeeTreeMapTest.vala | 8 +-
test/SerializableObjectModel-Tw-Test.vala | 26 ++--
test/SerializableObjectModelTest.vala | 212 +++++++++++++-------------
test/SerializablePropertyBoolTest.vala | 46 +++---
test/SerializablePropertyDoubleTest.vala | 38 +++---
test/SerializablePropertyEnumTest.vala | 48 +++---
test/SerializablePropertyFloatTest.vala | 40 +++---
test/SerializablePropertyIntTest.vala | 42 +++---
test/SerializablePropertyValueListTest.vala | 76 +++++-----
test/SerializableTest.vala | 12 +-
17 files changed, 366 insertions(+), 369 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 95ee4f4..fe885b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -93,7 +93,7 @@ AC_SUBST([PROJECT_MAJOR_MINOR_VERSION])
# - If new versions are compatible with the actual one, just leave this untouched
# - If new version breaks API change it in order to allow paralled installations
# with old versions. Change name of pc files to use a new API too.
-API_VERSION=0.6
+API_VERSION=0.10
AC_SUBST([API_VERSION])
GXML_VERSION=project_base_version
diff --git a/test/SerializableBasicTypesTest.vala b/test/SerializableBasicTypesTest.vala
index 114f023..63136c4 100644
--- a/test/SerializableBasicTypesTest.vala
+++ b/test/SerializableBasicTypesTest.vala
@@ -40,16 +40,16 @@ class SerializableBasicTypeTest : GXmlTest {
try {
var bt = new BasicType ();
bt.boolean = true;
- var doc = new xDocument ();
+ var doc = new GDocument ();
bt.serialize (doc);
- var element = doc.document_element;
- var b = element.get_attribute_node ("boolean");
+ var element = doc.root as Element;
+ var b = element.get_attr ("boolean");
if (b == null) {
stdout.printf (@"ERROR: No boolean exists\n");
assert_not_reached ();
}
- if (b.node_value.down () != "true") {
- stdout.printf (@"ERROR: Wrong boolean value. Expected true got: $(b.node_value.down ()) :
$(b.node_value)\n");
+ if (b.value.down () != "true") {
+ stdout.printf (@"ERROR: Wrong boolean value. Expected true got: $(b.value.down ()) :
$(b.value)\n");
assert_not_reached ();
}
//stdout.printf (@"\n$doc\n");
@@ -63,7 +63,7 @@ class SerializableBasicTypeTest : GXmlTest {
try {
var bt = new BasicType ();
bt.boolean = true;
- var doc = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc = new GDocument.from_string ("""<?xml version="1.0"?>
<basictype boolean="true"/>""");
bt.deserialize (doc);
if (bt.boolean != true) {
@@ -81,31 +81,31 @@ class SerializableBasicTypeTest : GXmlTest {
try {
var bt = new BasicType ();
bt.boolean = true;
- var doc = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc = new GDocument.from_string ("""<?xml version="1.0"?>
<basictype integer="156"/>""");
bt.deserialize (doc);
assert (bt.integer == 156);
- var doc1 = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc1 = new GDocument.from_string ("""<?xml version="1.0"?>
<basictype integer="a156"/>""");
bt.deserialize (doc1);
assert (bt.integer == 0);
- var doc2 = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc2 = new GDocument.from_string ("""<?xml version="1.0"?>
<basictype integer="156b"/>""");
bt.deserialize (doc2);
assert (bt.integer == 156);
- var doc3 = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc3 = new GDocument.from_string ("""<?xml version="1.0"?>
<basictype integer="156.0"/>""");
bt.deserialize (doc3);
assert (bt.integer == 156);
- var doc4 = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc4 = new GDocument.from_string ("""<?xml version="1.0"?>
<basictype integer="0.156"/>""");
bt.deserialize (doc4);
assert (bt.integer == 0);
- var doc5 = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc5 = new GDocument.from_string ("""<?xml version="1.0"?>
<basictype integer="a156.156"/>""");
bt.deserialize (doc5);
assert (bt.integer == 0);
- var doc6 = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc6 = new GDocument.from_string ("""<?xml version="1.0"?>
<basictype integer="156.156b"/>""");
bt.deserialize (doc6);
assert (bt.integer == 156);
@@ -119,35 +119,35 @@ class SerializableBasicTypeTest : GXmlTest {
try {
var bt = new BasicType ();
bt.boolean = true;
- var doc = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc = new GDocument.from_string ("""<?xml version="1.0"?>
<basictype floatval="156"/>""");
bt.deserialize (doc);
assert (bt.floatval == 156.0);
- var doc1 = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc1 = new GDocument.from_string ("""<?xml version="1.0"?>
<basictype floatval="a156"/>""");
bt.deserialize (doc1);
assert (bt.floatval == 0.0);
- var doc2 = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc2 = new GDocument.from_string ("""<?xml version="1.0"?>
<basictype floatval="156b"/>""");
bt.deserialize (doc2);
assert (bt.floatval == 156.0);
- var doc3 = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc3 = new GDocument.from_string ("""<?xml version="1.0"?>
<basictype floatval="156.0"/>""");
bt.deserialize (doc3);
assert (bt.floatval == 156.0);
- var doc4 = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc4 = new GDocument.from_string ("""<?xml version="1.0"?>
<basictype floatval="0.156"/>""");
bt.deserialize (doc4);
assert (bt.floatval == (float) 0.156);
- var doc5 = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc5 = new GDocument.from_string ("""<?xml version="1.0"?>
<basictype floatval="a156.156"/>""");
bt.deserialize (doc5);
assert (bt.floatval == 0.0);
- var doc6 = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc6 = new GDocument.from_string ("""<?xml version="1.0"?>
<basictype floatval="156.156b"/>""");
bt.deserialize (doc6);
assert (bt.floatval == (float) 156.156);
- var doc7 = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc7 = new GDocument.from_string ("""<?xml version="1.0"?>
<basictype boolean="true"/>""");
bt.floatval = (float) 0.0;
bt.deserialize (doc7);
@@ -162,35 +162,35 @@ class SerializableBasicTypeTest : GXmlTest {
try {
var bt = new BasicType ();
bt.boolean = true;
- var doc = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc = new GDocument.from_string ("""<?xml version="1.0"?>
<basictype doubleval="156"/>""");
bt.deserialize (doc);
assert (bt.doubleval == 156.0);
- var doc1 = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc1 = new GDocument.from_string ("""<?xml version="1.0"?>
<basictype doubleval="a156"/>""");
bt.deserialize (doc1);
assert (bt.doubleval == 0.0);
- var doc2 = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc2 = new GDocument.from_string ("""<?xml version="1.0"?>
<basictype doubleval="156b"/>""");
bt.deserialize (doc2);
assert (bt.doubleval == 156.0);
- var doc3 = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc3 = new GDocument.from_string ("""<?xml version="1.0"?>
<basictype doubleval="156.0"/>""");
bt.deserialize (doc3);
assert (bt.doubleval == 156.0);
- var doc4 = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc4 = new GDocument.from_string ("""<?xml version="1.0"?>
<basictype doubleval="0.156"/>""");
bt.deserialize (doc4);
assert (bt.doubleval == 0.156);
- var doc5 = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc5 = new GDocument.from_string ("""<?xml version="1.0"?>
<basictype doubleval="a156.156"/>""");
bt.deserialize (doc5);
assert (bt.doubleval == 0.0);
- var doc6 = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc6 = new GDocument.from_string ("""<?xml version="1.0"?>
<basictype doubleval="156.156b"/>""");
bt.deserialize (doc6);
assert (bt.doubleval == 156.156);
- var doc7 = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc7 = new GDocument.from_string ("""<?xml version="1.0"?>
<basictype boolean="true"/>""");
bt.doubleval = 0.0;
bt.deserialize (doc7);
diff --git a/test/SerializableGeeArrayListTest.vala b/test/SerializableGeeArrayListTest.vala
index 9e14f68..fdd2225 100644
--- a/test/SerializableGeeArrayListTest.vala
+++ b/test/SerializableGeeArrayListTest.vala
@@ -105,10 +105,10 @@ class SerializableGeeArrayListTest : GXmlTest
Test.add_func ("/gxml/serializable/serializable_array_list/deserialize",
() => {
try {
- var doc = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc = new GDocument.from_string ("""<?xml version="1.0"?>
<root><aelement name="Big"/><aelement name="Small"/></root>""");
var c = new SerializableArrayList<AElement> ();
- c.deserialize (doc.document_element);
+ c.deserialize (doc.root);
if (c.size != 2) {
stdout.printf (@"ERROR: incorrect size must be 2 got: $(c.size)\n");
assert_not_reached ();
@@ -136,13 +136,13 @@ class SerializableGeeArrayListTest : GXmlTest
Test.add_func ("/gxml/serializable/serializable_array_list/deserialize-serialize",
() => {
try {
- var idoc = new xDocument.from_string ("""<?xml version="1.0"?>
+ var idoc = new GDocument.from_string ("""<?xml version="1.0"?>
<root>
<aelement name="Big"/>
<aelement name="Small"/>
<aelement name="Wall">FAKE1</aelement>
</root>""");
- var iroot = idoc.document_element;
+ var iroot = idoc.root;
var ic = new SerializableArrayList<AElement> ();
ic.deserialize (iroot);
var doc = new TwDocument ();
@@ -177,7 +177,7 @@ class SerializableGeeArrayListTest : GXmlTest
Test.add_func ("/gxml/serializable/serializable_array_list/deserialize-node-names",
() => {
try {
- var d = new xDocument.from_path (GXmlTestConfig.TEST_DIR + "/test-collection.xml");
+ var d = new GDocument.from_path (GXmlTestConfig.TEST_DIR + "/test-collection.xml");
var bs = new BookStore ();
bs.deserialize (d);
assert (bs.name == "The Great Book");
diff --git a/test/SerializableGeeCollections-Tw-Test.vala b/test/SerializableGeeCollections-Tw-Test.vala
index 129a412..67c69f1 100644
--- a/test/SerializableGeeCollections-Tw-Test.vala
+++ b/test/SerializableGeeCollections-Tw-Test.vala
@@ -183,7 +183,7 @@ class SerializableGeeCollectionsTwTest : GXmlTest
Test.add_func ("/gxml/tw/serializable/convined_gee_containers/de-se-deserialize",
() => {
try {
- var doc = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc = new GDocument.from_string ("""<?xml version="1.0"?>
<base name="AlphaOne" >
<chargezone name="A1-1">
<ship manufacturer="MacToy" model="A1234">
@@ -407,7 +407,7 @@ class SerializableGeeCollectionsTwTest : GXmlTest
() => {
try {
// TODO: TwDocument Read XML files
- var org_doc = new xDocument.from_string ("""<?xml version="1.0"?>
+ var org_doc = new GDocument.from_string ("""<?xml version="1.0"?>
<base name="AlphaOne" >
<chargezone name="A1-1">
<ship manufacturer="MacToy" model="A1234">
@@ -478,7 +478,7 @@ class SerializableGeeCollectionsTwTest : GXmlTest
if (sn.name == "refaction") {
foreach (GXml.Node rn in sn.children) {
if (rn is Element) {
- //stdout.printf (@"Refaction current node: '$(rn.node_name)'\n");
+ //stdout.printf (@"Refaction current node: '$(rn.name)'\n");
if (rn.name == "ship") {
var atr = rn.attrs.get ("manufacturer");
assert (atr != null);
@@ -489,7 +489,7 @@ class SerializableGeeCollectionsTwTest : GXmlTest
assert (shanattr.value == "UNKNOWN ATTR");
}
foreach (GXml.Node shn in rn.children) {
- //stdout.printf (@"Refaction: Ship MegaTrench: Node: $(shn.node_name)\n");
+ //stdout.printf (@"Refaction: Ship MegaTrench: Node: $(shn.name)\n");
if (shn is Text) {
tfound = true;
assert (shn.value == "TEST_TEXT");
diff --git a/test/SerializableGeeCollectionsTest.vala b/test/SerializableGeeCollectionsTest.vala
index 21231e8..02743f7 100644
--- a/test/SerializableGeeCollectionsTest.vala
+++ b/test/SerializableGeeCollectionsTest.vala
@@ -33,7 +33,7 @@ class SerializableGeeCollectionsTest : GXmlTest
public string ctype { get; set; }
public string get_value () { return serialized_xml_node_value; }
public void set_value (string val) { serialized_xml_node_value = val; }
- //Enable set xElement content
+ //Enable set GElement content
public override bool serialize_use_xml_node_value () { return true; }
public override string to_string () { return @"Citizen: $ctype"; }
public override string node_name () { return "citizen"; }
@@ -184,7 +184,7 @@ class SerializableGeeCollectionsTest : GXmlTest
Test.add_func ("/gxml/serializable/convined_gee_containers/deserialize",
() => {
try {
- var doc = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc = new GDocument.from_string ("""<?xml version="1.0"?>
<base name="AlphaOne" >
<chargezone name="A1-1">
<ship manufacturer="MacToy" model="A1234">
@@ -287,7 +287,7 @@ class SerializableGeeCollectionsTest : GXmlTest
Test.add_func ("/gxml/serializable/convined_gee_containers/de-se-deserialize",
() => {
try {
- var doc = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc = new GDocument.from_string ("""<?xml version="1.0"?>
<base name="AlphaOne" >
<chargezone name="A1-1">
<ship manufacturer="MacToy" model="A1234">
@@ -351,7 +351,7 @@ class SerializableGeeCollectionsTest : GXmlTest
assert_not_reached ();
}
// Check First serialize
- var ndoc = new xDocument ();
+ var ndoc = new GDocument ();
s.serialize (ndoc);
var ns = new SpaceBase ();
ns.deserialize (ndoc);
@@ -373,27 +373,24 @@ class SerializableGeeCollectionsTest : GXmlTest
assert_not_reached ();
}
// Check xml structure
- if (ndoc.document_element == null) {
+ if (ndoc.root == null) {
stdout.printf ("ERROR: No ROOT element\n");
assert_not_reached ();
}
- if (ndoc.document_element.node_name != "base") {
+ if (ndoc.root.name != "base") {
stdout.printf ("ERROR: Bad ROOT name\n");
assert_not_reached ();
}
- if (!ndoc.document_element.has_child_nodes ()) {
- stdout.printf ("ERROR: No ROOT's child nodes\n");
- assert_not_reached ();
- }
+ assert (ndoc.root.children.size > 0);
int i = 0;
- foreach (GXml.xNode n in ndoc.document_element.child_nodes)
+ foreach (GXml.Node n in ndoc.root.children)
{
i++;
- if (n is Text) { if (n.node_value != "") assert_not_reached (); }
- if (n.node_name == "ChargeZone") {
- foreach (GXml.xNode cn in n.child_nodes)
+ if (n is Text) { if (n.value != "") assert_not_reached (); }
+ if (n.name == "ChargeZone") {
+ foreach (GXml.Node cn in n.children)
{
- if (n is Text) { if (n.node_value != "") assert_not_reached (); }
+ if (n is Text) { if (n.value != "") assert_not_reached (); }
}
}
@@ -411,7 +408,7 @@ class SerializableGeeCollectionsTest : GXmlTest
Test.add_func ("/gxml/serializable/convined_gee_containers/se-deserialize-unknowns",
() => {
try {
- var org_doc = new xDocument.from_string ("""<?xml version="1.0"?>
+ var org_doc = new GDocument.from_string ("""<?xml version="1.0"?>
<base name="AlphaOne" >
<chargezone name="A1-1">
<ship manufacturer="MacToy" model="A1234">
@@ -488,64 +485,64 @@ class SerializableGeeCollectionsTest : GXmlTest
assert (refaction.unknown_serializable_properties != null);
assert (refaction.unknown_serializable_properties.size == 0);
assert (refaction.unknown_serializable_nodes.size == 1);
- var doc = new xDocument ();
+ var doc = new GDocument ();
s.serialize (doc);
- if (doc.document_element.node_name != "base") {
+ if (doc.root.name != "base") {
stdout.printf (@"ERROR: bad root node name\n");
assert_not_reached ();
}
//stdout.printf (@"$doc\n");
- foreach (GXml.xNode n in doc.document_element.child_nodes) {
- if (n is xElement) {
- if (n.node_name == "ChargeZone") {
+ foreach (GXml.Node n in doc.root.children) {
+ if (n is GElement) {
+ if (n.name == "ChargeZone") {
}
- if (n.node_name == "storage") {
+ if (n.name == "storage") {
bool unkfound = false;
bool tfound = false;
bool attrfound = false;
- foreach (GXml.xNode sn in n.child_nodes) {
- if (sn is xElement) {
- if (sn.node_name == "refaction") {
- foreach (GXml.xNode rn in sn.child_nodes) {
- if (rn is xElement) {
- //stdout.printf (@"Refaction current node: '$(rn.node_name)'\n");
- if (rn.node_name == "ship") {
- var atr = ((xElement) rn).get_attribute_node ("manufacturer");
+ foreach (GXml.Node sn in n.children) {
+ if (sn is GElement) {
+ if (sn.name == "refaction") {
+ foreach (GXml.Node rn in sn.children) {
+ if (rn is GElement) {
+ //stdout.printf (@"Refaction current node: '$(rn.name)'\n");
+ if (rn.name == "ship") {
+ var atr = ((GElement) rn).get_attr ("manufacturer");
if (atr == null) {
stdout.printf (@"ERROR: No attribute manufacturer for Ship\n");
assert_not_reached ();
}
- if (atr.node_value == "MegaTrench") {
- var shanattr = ((xElement) rn).get_attribute_node ("unknown");
+ if (atr.value == "MegaTrench") {
+ var shanattr = ((GElement) rn).get_attr ("unknown");
if (shanattr != null) {
attrfound = true;
- if (shanattr.node_value != "UNKNOWN ATTR") {
- stdout.printf (@"ERROR: Invalid Text Node Value for ship MegaTrench:
$(shanattr.node_value)\n");
+ if (shanattr.value != "UNKNOWN ATTR") {
+ stdout.printf (@"ERROR: Invalid Text Node Value for ship MegaTrench:
$(shanattr.value)\n");
assert_not_reached ();
}
}
- foreach (GXml.xNode shn in rn.child_nodes) {
- //stdout.printf (@"Refaction: Ship MegaTrench: Node: $(shn.node_name)\n");
+ foreach (GXml.Node shn in rn.children) {
+ //stdout.printf (@"Refaction: Ship MegaTrench: Node: $(shn.name)\n");
if (shn is Text) {
tfound = true;
- if (shn.node_value != "TEST_TEXT") {
- stdout.printf (@"ERROR: Invalid Text Node Value for ship MegaTrench:
$(shn.node_value)\n");
+ if (shn.value != "TEST_TEXT") {
+ stdout.printf (@"ERROR: Invalid Text Node Value for ship MegaTrench:
$(shn.value)\n");
assert_not_reached ();
}
}
}
}
}
- if (rn.node_name == "UnknownAttribute") {
+ if (rn.name == "UnknownAttribute") {
unkfound = true;
- var nattr = ((xElement) rn).get_attribute_node ("name");
+ var nattr = ((GElement) rn).get_attr ("name");
if (nattr == null) {
stdout.printf (@"ERROR: No Unknown Attribute Node with attribute name\n");
assert_not_reached ();
}
- if (nattr.node_value != "nothing") {
- stdout.printf (@"ERROR: Invalid unknown attribute node's attribute name value:
found $(nattr.node_value)\n");
+ if (nattr.value != "nothing") {
+ stdout.printf (@"ERROR: Invalid unknown attribute node's attribute name value:
found $(nattr.value)\n");
assert_not_reached ();
}
}
@@ -569,7 +566,7 @@ class SerializableGeeCollectionsTest : GXmlTest
}
}
if (n is Text) {
- stdout.printf (@"ROOT NODE VALUE: '$(n.node_value)'\n");
+ stdout.printf (@"ROOT NODE VALUE: '$(n.value)'\n");
}
}
}
diff --git a/test/SerializableGeeDualKeyMapTest.vala b/test/SerializableGeeDualKeyMapTest.vala
index 30fbd17..fc2f3af 100644
--- a/test/SerializableGeeDualKeyMapTest.vala
+++ b/test/SerializableGeeDualKeyMapTest.vala
@@ -196,10 +196,10 @@ class SerializableGeeDualKeyMapTest : GXmlTest
Test.add_func ("/gxml/serializable/serializable_dual_key_map/deserialize",
() => {
try {
- var doc = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc = new GDocument.from_string ("""<?xml version="1.0"?>
<root><spaces name="Small" owner="Wall"/><spaces name="Smallest" owner="Wall"/><spaces name="Big"
owner="Floor"/><spaces name="Bigger" owner="Floor"/><spark /></root>""");
var c = new SerializableDualKeyMap<string,string,Spaces> ();
- c.deserialize (doc.document_element);
+ c.deserialize (doc.root);
if (c.size != 4) {
stdout.printf (@"ERROR: incorrect size must be 4 got: $(c.size)\n");
assert_not_reached ();
@@ -239,19 +239,19 @@ class SerializableGeeDualKeyMapTest : GXmlTest
Test.add_func ("/gxml/serializable/serializable_dual_key_map/de-se-deserialize",
() => {
try {
- var idoc = new xDocument.from_string ("""<?xml version="1.0"?>
+ var idoc = new GDocument.from_string ("""<?xml version="1.0"?>
<root><spaces name="Small" owner="Wall"/><spaces name="Smallest" owner="Wall"/><spaces name="Big"
owner="Floor"/><spaces name="Bigger" owner="Floor"/><spark /></root>""");
var ic = new SerializableDualKeyMap<string,string,Spaces> ();
- ic.deserialize (idoc.document_element);
+ ic.deserialize (idoc.root);
if (ic.size != 4) {
stdout.printf (@"ERROR: Incorrect size (1st deserialize). Expected 4, got: $(ic.size)\n$idoc\n");
assert_not_reached ();
}
- var doc = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc = new GDocument.from_string ("""<?xml version="1.0"?>
<root />""");
- ic.serialize (doc.document_element);
+ ic.serialize (doc.root);
var c = new SerializableDualKeyMap<string,string,Spaces> ();
- c.deserialize (doc.document_element);
+ c.deserialize (doc.root);
if (c.size != 4) {
stdout.printf (@"ERROR: Incorrect size. Expected 4, got: $(c.size)\n$doc\n");
assert_not_reached ();
@@ -265,7 +265,7 @@ class SerializableGeeDualKeyMapTest : GXmlTest
Test.add_func ("/gxml/serializable/serializable_dual_key_map/deserialize-node-names",
() => {
try {
- var d = new xDocument.from_path (GXmlTestConfig.TEST_DIR + "/test-collection.xml");
+ var d = new GDocument.from_path (GXmlTestConfig.TEST_DIR + "/test-collection.xml");
var bs = new BookStore ();
bs.deserialize (d);
assert (bs.name == "The Great Book");
diff --git a/test/SerializableGeeHashMapTest.vala b/test/SerializableGeeHashMapTest.vala
index ceb6a6b..c842cc7 100644
--- a/test/SerializableGeeHashMapTest.vala
+++ b/test/SerializableGeeHashMapTest.vala
@@ -154,10 +154,10 @@ class SerializableGeeHashMapTest : GXmlTest
Test.add_func ("/gxml/serializable/serializable_hash_map/deserialize",
() => {
try {
- var doc = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc = new GDocument.from_string ("""<?xml version="1.0"?>
<root><space name="Big"/><space name="Small"/></root>""");
var c = new SerializableHashMap<string,Space> ();
- c.deserialize (doc.document_element);
+ c.deserialize (doc.root);
if (c.size != 2) {
stdout.printf (@"ERROR: incorrect size must be 2 got: $(c.size)\n");
assert_not_reached ();
@@ -185,7 +185,7 @@ class SerializableGeeHashMapTest : GXmlTest
Test.add_func ("/gxml/serializable/serializable_hash_map/container_class/deserialize",
() => {
try {
- var doc = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc = new GDocument.from_string ("""<?xml version="1.0"?>
<spacecontainer owner="Earth"><space name="Big"/><space name="Small"/></spacecontainer>""");
var c = new SpaceContainer ();
c.deserialize (doc);
@@ -254,7 +254,7 @@ class SerializableGeeHashMapTest : GXmlTest
Test.add_func ("/gxml/serializable/serializable_hash_map/deserialize-serialize",
() => {
try {
- var idoc = new xDocument.from_string ("""<?xml version="1.0"?>
+ var idoc = new GDocument.from_string ("""<?xml version="1.0"?>
<spacecontainer owner="Earth">
<space name="Big"/>
<space name="Big">FAKE1</space>
@@ -299,7 +299,7 @@ class SerializableGeeHashMapTest : GXmlTest
Test.add_func ("/gxml/serializable/serializable_hash_map/deserialize-node-names",
() => {
try {
- var d = new xDocument.from_path (GXmlTestConfig.TEST_DIR + "/test-collection.xml");
+ var d = new GDocument.from_path (GXmlTestConfig.TEST_DIR + "/test-collection.xml");
var bs = new BookStore ();
bs.deserialize (d);
assert (bs.name == "The Great Book");
diff --git a/test/SerializableGeeTreeMapTest.vala b/test/SerializableGeeTreeMapTest.vala
index 968f981..7c70d59 100644
--- a/test/SerializableGeeTreeMapTest.vala
+++ b/test/SerializableGeeTreeMapTest.vala
@@ -129,10 +129,10 @@ class SerializableGeeTreeMapTest : GXmlTest
Test.add_func ("/gxml/serializable/serializable_tree_map/deserialize",
() => {
try {
- var doc = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc = new GDocument.from_string ("""<?xml version="1.0"?>
<root><space name="Big"/><space name="Small"/></root>""");
var c = new SerializableTreeMap<string,Space> ();
- c.deserialize (doc.document_element);
+ c.deserialize (doc.root);
if (c.size != 2) {
stdout.printf (@"ERROR: incorrect size must be 2 got: $(c.size)\n");
assert_not_reached ();
@@ -160,7 +160,7 @@ class SerializableGeeTreeMapTest : GXmlTest
Test.add_func ("/gxml/serializable/serializable_tree_map/container_class/deserialize",
() => {
try {
- var doc = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc = new GDocument.from_string ("""<?xml version="1.0"?>
<spacecontainer owner="Earth"><space name="Big"/><space name="Small"/></spacecontainer>""");
var c = new SpaceContainer ();
c.deserialize (doc);
@@ -245,7 +245,7 @@ class SerializableGeeTreeMapTest : GXmlTest
Test.add_func ("/gxml/serializable/serializable_tree_map/deserialize-node-names",
() => {
try {
- var d = new xDocument.from_path (GXmlTestConfig.TEST_DIR + "/test-collection.xml");
+ var d = new GDocument.from_path (GXmlTestConfig.TEST_DIR + "/test-collection.xml");
var bs = new BookStore ();
bs.deserialize (d);
assert (bs.name == "The Great Book");
diff --git a/test/SerializableObjectModel-Tw-Test.vala b/test/SerializableObjectModel-Tw-Test.vala
index efb65cb..a11c05b 100644
--- a/test/SerializableObjectModel-Tw-Test.vala
+++ b/test/SerializableObjectModel-Tw-Test.vala
@@ -75,7 +75,7 @@ class SerializableObjectModelTwTest : GXmlTest
try {
package.serialize (doc);
if (doc.root.name != "package") {
- stdout.printf (@"ERROR MANUAL: xElement: $(doc.root.name)\n");
+ stdout.printf (@"ERROR MANUAL: GElement: $(doc.root.name)\n");
assert_not_reached ();
}
Element element = (Element) doc.root;
@@ -114,9 +114,9 @@ class SerializableObjectModelTwTest : GXmlTest
bool cus = false;
bool sal = false;
foreach (GXml.Node n in element.children) {
- //stdout.printf (@"Found xElement: $(n.node_name)");
+ //stdout.printf (@"Found GElement: $(n.name)");
if (n.name == "tag") {
- //stdout.printf (@"Found: $(n.node_name)");
+ //stdout.printf (@"Found: $(n.name)");
if (((Element) n).content == "Computer")
com = true;
if (((Element) n).content == "Customer")
@@ -159,7 +159,7 @@ class SerializableObjectModelTwTest : GXmlTest
}
Element element = (Element) doc.root;
if (element.name != "monitor") {
- stdout.printf (@"ERROR MONITOR: root xElement $(element.name)");
+ stdout.printf (@"ERROR MONITOR: root GElement $(element.name)");
assert_not_reached ();
}
var ac = element.attrs.get ("AcPower");
@@ -390,7 +390,7 @@ class SerializableObjectModelTwTest : GXmlTest
() => {
var package = new Package ();
try {
- var doc = new xDocument.from_string (XML_PACKAGE_FILE);
+ var doc = new GDocument.from_string (XML_PACKAGE_FILE);
package.deserialize (doc);
if (package.source != "Mexico/Central") {
stdout.printf (@"ERROR PACKAGE: source: $(package.source)\n");
@@ -438,7 +438,7 @@ class SerializableObjectModelTwTest : GXmlTest
() => {
var computer = new Computer ();
try {
- var doc = new xDocument.from_string (XML_COMPUTER_FILE);
+ var doc = new GDocument.from_string (XML_COMPUTER_FILE);
computer.deserialize (doc);
if (computer.manufacturer != "ThecnicalGroup") {
stdout.printf (@"ERROR XML_COMPUTER: manufacturer val: $(computer.manufacturer)\n");
@@ -466,7 +466,7 @@ class SerializableObjectModelTwTest : GXmlTest
() => {
var manual = new Manual ();
try {
- var doc = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc = new GDocument.from_string ("""<?xml version="1.0"?>
<manual document="Specification" pages="3">This is an Specification file</manual>""");
manual.deserialize (doc);
if (manual.document != "Specification") {
@@ -478,7 +478,7 @@ class SerializableObjectModelTwTest : GXmlTest
assert_not_reached ();
}
if (manual.get_contents () != "This is an Specification file") {
- stdout.printf (@"ERROR MANUAL: Bad xElement content value. Expected 'This is an Specification
file', got: $(manual.get_contents ())\n");
+ stdout.printf (@"ERROR MANUAL: Bad GElement content value. Expected 'This is an Specification
file', got: $(manual.get_contents ())\n");
assert_not_reached ();
}
}
@@ -491,7 +491,7 @@ class SerializableObjectModelTwTest : GXmlTest
Test.add_func ("/gxml/tw/serializable/object_model/deserialize_array_property",
() => {
- var doc = new xDocument.from_string (XML_PACKAGE_FILE);
+ var doc = new GDocument.from_string (XML_PACKAGE_FILE);
var package = new Package ();
try {
package.deserialize (doc);
@@ -519,7 +519,7 @@ class SerializableObjectModelTwTest : GXmlTest
});
Test.add_func ("/gxml/tw/serializable/object_model/override_deserialize",
() => {
- var doc = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc = new GDocument.from_string ("""<?xml version="1.0"?>
<Configuration xmlns:om="http://www.gnome.org/gxml/0.4"; device="Sampler"/>""");
var configuration = new Configuration ();
try {
@@ -533,7 +533,7 @@ Test.add_func ("/gxml/tw/serializable/object_model/override_deserialize",
if (configuration.invalid == true) {
#if DEBUG
stdout.printf ("CONFIGURATION: deserialize is INVALID\n");
- foreach (GXml.Namespace n in doc.document_element.namespace_definitions) {
+ foreach (GXml.Namespace n in doc.root.namespace_definitions) {
stdout.printf (@"CONFIGURATION: namespace: $(n.uri)\n");
}
#endif
@@ -547,7 +547,7 @@ Test.add_func ("/gxml/tw/serializable/object_model/override_deserialize",
});
Test.add_func ("/gxml/tw/serializable/object_model/custome_node_name",
() => {
- var doc = new xDocument.from_string ("""<?xml version="1.0"?><NodeName />""");
+ var doc = new GDocument.from_string ("""<?xml version="1.0"?><NodeName />""");
var nodename = new NodeName ();
try {
nodename.deserialize (doc);
@@ -560,7 +560,7 @@ Test.add_func ("/gxml/tw/serializable/object_model/override_deserialize",
Test.add_func ("/gxml/tw/serializable/object_model/deserialize_incorrect_uint",
() => {
try {
- var doc = new xDocument.from_string (
+ var doc = new GDocument.from_string (
"""<?xml version="1.0"?>
<PACKAGE source="Mexico/North" destiny="Brazil" Hope="2/4.04">
<manual document="Sales Card" pages="1">Selling Card Specification</manual>
diff --git a/test/SerializableObjectModelTest.vala b/test/SerializableObjectModelTest.vala
index 1ea29e0..349155b 100644
--- a/test/SerializableObjectModelTest.vala
+++ b/test/SerializableObjectModelTest.vala
@@ -140,7 +140,7 @@ public class Package : ObjectModel
((Serializable) this).deserialize_unknown_property.connect ( (element, prop) => {
//GLib.message (@"Deserializing Unknown Property: $(prop.name) | $(prop.get_nick ())");
if (element.name == "tag") {
- tags.append_val (((xElement) element).content);
+ tags.append_val (((GElement) element).content);
}
});
}
@@ -300,33 +300,33 @@ class SerializableObjectModelTest : GXmlTest
() => {
try {
var computer = new Computer ();
- var doc = new xDocument ();
+ var doc = new GDocument ();
computer.serialize (doc);
- if (doc.document_element.tag_name.down () != "computer") {
+ if (doc.root.name.down () != "computer") {
stdout.printf ("ERROR XML_COMPUTER: computer\n");
assert_not_reached ();
}
- var m = doc.document_element.get_attribute_node ("manufacturer");
+ var m = (doc.root as Element).get_attr ("manufacturer");
if (m == null) assert_not_reached ();
- if (m.node_value != "MexicanLaptop, Inc.") {
+ if (m.value != "MexicanLaptop, Inc.") {
stdout.printf ("ERROR XML_COMPUTER: manufacturer\n");
assert_not_reached ();
}
- var mod = doc.document_element.get_attribute_node ("model");
+ var mod = (doc.root as Element).get_attr ("model");
if (mod == null) assert_not_reached ();
- if (mod.node_value != "LQ59678") {
+ if (mod.value != "LQ59678") {
stdout.printf ("ERROR XML_COMPUTER: model\n");
assert_not_reached ();
}
- var c = doc.document_element.get_attribute_node ("cores");
+ var c = (doc.root as Element).get_attr ("cores");
if (c == null) assert_not_reached ();
- if (c.node_value != "8") {
+ if (c.value != "8") {
stdout.printf ("ERROR XML_COMPUTER: cores val\n");
assert_not_reached ();
}
- var g = doc.document_element.get_attribute_node ("ghz");
+ var g = (doc.root as Element).get_attr ("ghz");
if (g == null) assert_not_reached ();
- if (double.parse (g.node_value) != (double) 3.5) {
+ if (double.parse (g.value) != (double) 3.5) {
stdout.printf ("ERROR XML_COMPUTER: ghz val\n");
assert_not_reached ();
}
@@ -342,7 +342,7 @@ class SerializableObjectModelTest : GXmlTest
() => {
var computer = new Computer ();
try {
- var doc = new xDocument.from_string (XML_COMPUTER_FILE);
+ var doc = new GDocument.from_string (XML_COMPUTER_FILE);
computer.deserialize (doc);
if (computer.manufacturer != "ThecnicalGroup") {
stdout.printf (@"ERROR XML_COMPUTER: manufacturer val: $(computer.manufacturer)\n");
@@ -371,7 +371,7 @@ class SerializableObjectModelTest : GXmlTest
() => {
var manual = new Manual ();
try {
- var doc = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc = new GDocument.from_string ("""<?xml version="1.0"?>
<manual document="Specification" pages="3">This is an Specification file</manual>""");
manual.deserialize (doc);
if (manual.document != "Specification") {
@@ -383,7 +383,7 @@ class SerializableObjectModelTest : GXmlTest
assert_not_reached ();
}
if (manual.get_contents () != "This is an Specification file") {
- stdout.printf (@"ERROR MANUAL: Bad xElement content value. Expected 'This is an
Specification file', got: $(manual.get_contents ())\n");
+ stdout.printf (@"ERROR MANUAL: Bad GElement content value. Expected 'This is an
Specification file', got: $(manual.get_contents ())\n");
assert_not_reached ();
}
}
@@ -395,15 +395,15 @@ class SerializableObjectModelTest : GXmlTest
);
Test.add_func ("/gxml/serializable/object_model/serialize_object_contents",
() => {
- var doc = new xDocument ();
+ var doc = new GDocument ();
var manual = new Manual ();
try {
manual.serialize (doc);
- if (doc.document_element.node_name != "manual") {
- stdout.printf (@"ERROR MANUAL: xElement: $(doc.document_element.node_name)\n");
+ if (doc.root.name != "manual") {
+ stdout.printf (@"ERROR MANUAL: GElement: $(doc.root.name)\n");
assert_not_reached ();
}
- xElement element = doc.document_element;
+ var element = doc.root as GElement;
serialize_manual_check (element, manual);
} catch (GLib.Error e) {
stdout.printf (@"$(e.message)");
@@ -415,7 +415,7 @@ class SerializableObjectModelTest : GXmlTest
() => {
var package = new Package ();
try {
- var doc = new xDocument.from_string (XML_PACKAGE_FILE);
+ var doc = new GDocument.from_string (XML_PACKAGE_FILE);
package.deserialize (doc);
if (package.source != "Mexico/Central") {
stdout.printf (@"ERROR PACKAGE: source: $(package.source)\n");
@@ -466,25 +466,25 @@ class SerializableObjectModelTest : GXmlTest
);
Test.add_func ("/gxml/serializable/object_model/serialize_serializable_properties",
() => {
- var doc = new xDocument ();
+ var doc = new GDocument ();
var package = new Package ();
try {
package.serialize (doc);
- if (doc.document_element.node_name != "package") {
- stdout.printf (@"ERROR MANUAL: xElement: $(doc.document_element.node_name)\n");
+ if (doc.root.name != "package") {
+ stdout.printf (@"ERROR MANUAL: GElement: $(doc.root.name)\n");
assert_not_reached ();
}
- xElement element = doc.document_element;
- var source = element.get_attribute_node ("source");
+ var element = doc.root as Element;
+ var source = element.get_attr ("source");
if (source == null ) assert_not_reached ();
- if (source.node_value != "Mexico") {
- stdout.printf (@"ERROR PACKAGE: source: $(source.node_value)\n");
+ if (source.value != "Mexico") {
+ stdout.printf (@"ERROR PACKAGE: source: $(source.value)\n");
assert_not_reached ();
}
- var destiny = element.get_attribute_node ("destiny");
+ var destiny = element.get_attr ("destiny");
if (destiny == null ) assert_not_reached ();
- if (destiny.node_value != "World") {
- stdout.printf (@"ERROR PACKAGE: source: $(destiny.node_value)\n");
+ if (destiny.value != "World") {
+ stdout.printf (@"ERROR PACKAGE: source: $(destiny.value)\n");
assert_not_reached ();
}
}
@@ -496,7 +496,7 @@ class SerializableObjectModelTest : GXmlTest
);
Test.add_func ("/gxml/serializable/object_model/deserialize_array_property",
() => {
- var doc = new xDocument.from_string (XML_PACKAGE_FILE);
+ var doc = new GDocument.from_string (XML_PACKAGE_FILE);
var package = new Package ();
try {
package.deserialize (doc);
@@ -525,7 +525,7 @@ class SerializableObjectModelTest : GXmlTest
);
Test.add_func ("/gxml/serializable/object_model/serialize_array_property",
() => {
- var doc = new xDocument ();
+ var doc = new GDocument ();
var package = new Package ();
package.tags.append_val ("Computer");
package.tags.append_val ("Customer");
@@ -533,21 +533,21 @@ class SerializableObjectModelTest : GXmlTest
try {
package.serialize (doc);
//stdout.printf (@"$(doc)");
- if (doc.document_element.node_name != "package")
+ if (doc.root.name != "package")
assert_not_reached ();
- xElement element = doc.document_element;
+ var element = doc.root as Element;
bool com = false;
bool cus = false;
bool sal = false;
- foreach (GXml.xNode n in element.child_nodes) {
- //stdout.printf (@"Found xElement: $(n.node_name)");
- if (n.node_name == "tag") {
- //stdout.printf (@"Found: $(n.node_name)");
- if (((xElement) n).content == "Computer")
+ foreach (GXml.Node n in element.children) {
+ //stdout.printf (@"Found GElement: $(n.name)");
+ if (n.name == "tag") {
+ //stdout.printf (@"Found: $(n.name)");
+ if (((GElement) n).content == "Computer")
com = true;
- if (((xElement) n).content == "Customer")
+ if (((GElement) n).content == "Customer")
cus = true;
- if (((xElement) n).content == "Sale")
+ if (((GElement) n).content == "Sale")
sal = true;
}
}
@@ -572,7 +572,7 @@ class SerializableObjectModelTest : GXmlTest
);
Test.add_func ("/gxml/serializable/object_model/serialize_property_nick",
() => {
- var doc = new xDocument ();
+ var doc = new GDocument ();
var monitor = new Monitor ();
try {
monitor.resolution = "1204x720";
@@ -580,40 +580,40 @@ class SerializableObjectModelTest : GXmlTest
monitor.dc_power = 125;
monitor.serialize (doc);
//stdout.printf (@"DOC: [$(doc)]");
- if (doc.document_element == null) {
- stdout.printf ("ERROR MONITOR: No root xElement");
+ if (doc.root == null) {
+ stdout.printf ("ERROR MONITOR: No root GElement");
assert_not_reached ();
}
- xElement element = doc.document_element;
- if (element.node_name != "monitor") {
- stdout.printf (@"ERROR MONITOR: root xElement $(element.node_name)");
+ var element = doc.root as Element;
+ if (element.name != "monitor") {
+ stdout.printf (@"ERROR MONITOR: root GElement $(element.name)");
assert_not_reached ();
}
- var ac = element.get_attribute_node ("AcPower");
+ var ac = element.get_attr ("AcPower");
if (ac == null) {
stdout.printf (@"ERROR MONITOR: attribute AcPower not found");
assert_not_reached ();
}
- if (ac.node_value != "120") {
- stdout.printf (@"ERROR MONITOR: AcPower value $(ac.node_value)");
+ if (ac.value != "120") {
+ stdout.printf (@"ERROR MONITOR: AcPower value $(ac.value)");
assert_not_reached ();
}
- var dc = element.get_attribute_node ("DcPower");
+ var dc = element.get_attr ("DcPower");
if (dc == null) {
stdout.printf (@"ERROR MONITOR: attribute DcPower not found");
assert_not_reached ();
}
- if (dc.node_value != "125") {
- stdout.printf (@"ERROR MONITOR: AcPower value $(dc.node_value)");
+ if (dc.value != "125") {
+ stdout.printf (@"ERROR MONITOR: AcPower value $(dc.value)");
assert_not_reached ();
}
- var r = element.get_attribute_node ("resolution");
+ var r = element.get_attr ("resolution");
if (r == null) {
stdout.printf (@"ERROR MONITOR: attribute resolution not found");
assert_not_reached ();
}
- if (r.node_value != "1204x720") {
- stdout.printf (@"ERROR MONITOR: resolution value $(r.node_value)");
+ if (r.value != "1204x720") {
+ stdout.printf (@"ERROR MONITOR: resolution value $(r.value)");
assert_not_reached ();
}
}
@@ -630,34 +630,34 @@ class SerializableObjectModelTest : GXmlTest
cpu.piles.add (1);
cpu.piles.add (2);
cpu.piles.add (3);
- var doc = new xDocument ();
+ var doc = new GDocument ();
try {
cpu.serialize (doc);
//stdout.printf (@"$doc");
- if (doc.document_element == null) {
+ if (doc.root == null) {
stdout.printf (@"ERROR CPU: no root element");
assert_not_reached ();
}
- if (doc.document_element.node_name != "cpu") {
- stdout.printf (@"ERROR CPU: root element $(doc.document_element.node_name)");
+ if (doc.root.name != "cpu") {
+ stdout.printf (@"ERROR CPU: root element $(doc.root.name)");
assert_not_reached ();
}
- var ghz = doc.document_element.get_attribute_node ("ghz");
+ var ghz = (doc.root as Element).get_attr ("ghz");
if (ghz == null) {
stdout.printf (@"ERROR CPU: no attribute ghz");
assert_not_reached ();
}
- if (ghz.node_value != "3.85") {
- stdout.printf (@"ERROR CPU: ghz '$(ghz.node_value)'");
+ if (ghz.value != "3.85") {
+ stdout.printf (@"ERROR CPU: ghz '$(ghz.value)'");
assert_not_reached ();
}
- var p = doc.document_element.get_attribute_node ("piles");
+ var p = (doc.root as Element).get_attr ("piles");
if (p == null) {
stdout.printf (@"ERROR CPU: no attribute piles");
assert_not_reached ();
}
- if (p.node_value != "1,2,3") {
- stdout.printf (@"ERROR CPU: piles '$(p.node_value)'");
+ if (p.value != "1,2,3") {
+ stdout.printf (@"ERROR CPU: piles '$(p.value)'");
assert_not_reached ();
}
}
@@ -669,7 +669,7 @@ class SerializableObjectModelTest : GXmlTest
Test.add_func ("/gxml/serializable/object_model/override_transform_from_string",
() => {
var cpu = new Cpu ();
- var doc = new xDocument.from_string (XML_CPU_FILE);
+ var doc = new GDocument.from_string (XML_CPU_FILE);
try {
cpu.deserialize (doc);
//stdout.printf (@"$doc");
@@ -701,13 +701,13 @@ class SerializableObjectModelTest : GXmlTest
});
Test.add_func ("/gxml/serializable/object_model/override_serialize",
() => {
- var doc = new xDocument ();
+ var doc = new GDocument ();
var configuration = new Configuration ();
configuration.device = "Controller";
try {
configuration.serialize (doc);
//stdout.printf (@"DOC: $doc");
- if (doc.document_element == null) {
+ if (doc.root == null) {
#if DEBUG
GLib.message ("DOC: No root element");
#endif
@@ -743,7 +743,7 @@ class SerializableObjectModelTest : GXmlTest
});
Test.add_func ("/gxml/serializable/object_model/override_deserialize",
() => {
- var doc = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc = new GDocument.from_string ("""<?xml version="1.0"?>
<Configuration xmlns:om="http://www.gnome.org/gxml/0.4"; device="Sampler"/>""");
var configuration = new Configuration ();
try {
@@ -757,7 +757,7 @@ class SerializableObjectModelTest : GXmlTest
if (configuration.invalid == true) {
#if DEBUG
stdout.printf ("CONFIGURATION: deserialize is INVALID\n");
- foreach (GXml.Namespace n in doc.document_element.namespace_definitions) {
+ foreach (GXml.Namespace n in doc.root.namespaces) {
stdout.printf (@"CONFIGURATION: namespace: $(n.uri)\n");
}
#endif
@@ -771,7 +771,7 @@ class SerializableObjectModelTest : GXmlTest
});
Test.add_func ("/gxml/serializable/object_model/custome_node_name",
() => {
- var doc = new xDocument.from_string ("""<?xml version="1.0"?><NodeName />""");
+ var doc = new GDocument.from_string ("""<?xml version="1.0"?><NodeName />""");
var nodename = new NodeName ();
try {
nodename.deserialize (doc);
@@ -783,23 +783,23 @@ class SerializableObjectModelTest : GXmlTest
});
Test.add_func ("/gxml/serializable/object_model/no_serialize_null_property",
() => {
- var doc = new xDocument();
+ var doc = new GDocument();
var unknown_property = new UnknownAttribute (); // name is set to null
try {
unknown_property.serialize (doc);
//stdout.printf (@"DOCUMENT: $doc"); assert_not_reached ();
- var name = doc.document_element.get_attribute_node ("name");
+ var name = (doc.root as GElement).get_attr ("name");
if (name != null) {
- stdout.printf (@"ERROR: NULL ATTRIBUTE SERIALIZATION: name found
$(name.node_name)");
+ stdout.printf (@"ERROR: NULL ATTRIBUTE SERIALIZATION: name found $(name.name)");
assert_not_reached ();
}
- var array = doc.document_element.get_attribute_node ("array");
+ var array = (doc.root as Element).get_attr ("array");
if (array != null) {
- stdout.printf (@"ERROR: NULL ATTRIBUTE SERIALIZATION: array found
$(array.node_name)");
+ stdout.printf (@"ERROR: NULL ATTRIBUTE SERIALIZATION: array found $(array.name)");
assert_not_reached ();
}
- if (doc.document_element.has_child_nodes ()) {
- stdout.printf (@"ERROR: NULL ATTRIBUTE SERIALIZATION: Nodes found
$(doc.document_element.has_child_nodes ())");
+ if (doc.root.children.size > 0) {
+ stdout.printf (@"ERROR: NULL ATTRIBUTE SERIALIZATION: Nodes found
$(doc.root.children.size > 0)");
assert_not_reached ();
}
}
@@ -810,7 +810,7 @@ class SerializableObjectModelTest : GXmlTest
});
Test.add_func ("/gxml/serializable/object_model/unknown_property",
() => {
- var doc = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc = new GDocument.from_string ("""<?xml version="1.0"?>
<UnknownAttribute ignore="true" ignore2="test"><UnknownNode toignore = "true" />TEXT</UnknownAttribute>""");
assert (doc.root != null);
assert (doc.root.name == "UnknownAttribute");
@@ -876,7 +876,7 @@ class SerializableObjectModelTest : GXmlTest
});
Test.add_func ("/gxml/serializable/object_model/deserialize_unknown_property",
() => {
- var doc = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc = new GDocument.from_string ("""<?xml version="1.0"?>
<UnknownAttribute ignore="true" ignore2="test">
<UnknownNode direction = "fordward">
<UnknownChild t = "test">
@@ -886,7 +886,7 @@ class SerializableObjectModelTest : GXmlTest
var unknown_property = new UnknownAttribute ();
try {
unknown_property.deserialize (doc);
- var doc2 = (GXml.Document) new xDocument ();
+ var doc2 = (GXml.Document) new GDocument ();
#if DEBUG
GLib.message ("Prepare to Serialize...");
#endif
@@ -896,12 +896,12 @@ class SerializableObjectModelTest : GXmlTest
GLib.message ("Serialized back document: \n"+doc2.to_string ());
#endif
if (doc2.root == null) {
- stdout.printf (@"ERROR: UNKNOWN_ATTRIBUTE: SERIALIZATION: No Root xElement");
+ stdout.printf (@"ERROR: UNKNOWN_ATTRIBUTE: SERIALIZATION: No Root GElement");
assert_not_reached ();
}
GXml.Element element = (GXml.Element) doc2.root;
if (element.name.down () != "unknownattribute") {
- stdout.printf (@"ERROR: UNKNOWN_ATTRIBUTE: SERIALIZATION: Root xElement Bad name
$(element.name.down ())");
+ stdout.printf (@"ERROR: UNKNOWN_ATTRIBUTE: SERIALIZATION: Root GElement Bad name
$(element.name.down ())");
assert_not_reached ();
}
var ignore = element.attrs.get ("ignore");
@@ -990,7 +990,7 @@ class SerializableObjectModelTest : GXmlTest
stdout.printf (@"ERROR: UNKNOWN_ATTRIBUTE: SERIALIZATION: UnknownNode No not
found");
assert_not_reached ();
}
- // TODO: serialized_xml_node_value have more text than expected, may be a bug in
xDocument.to_string ()
+ // TODO: serialized_xml_node_value have more text than expected, may be a bug in
GDocument.to_string ()
if (unknown_property.serialized_xml_node_value == "FAKE TEXT") {
stdout.printf (@"ERROR: UNKNOWN_ATTRIBUTE: SERIALIZATION: Bad UnknownAttribute
node's content text $(unknown_property.serialized_xml_node_value)");
assert_not_reached ();
@@ -1004,27 +1004,27 @@ class SerializableObjectModelTest : GXmlTest
Test.add_func ("/gxml/serializable/object_model/serialize_unknown_property",
() => {
try {
- var doc = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc = new GDocument.from_string ("""<?xml version="1.0"?>
<UnknownAttribute ignore="true" ignore2="test"><UnknownNode toignore = "true" />TEXT</UnknownAttribute>""");
var unknown_property = new UnknownAttribute ();
unknown_property.deserialize (doc);
- var ndoc = new xDocument ();
+ var ndoc = new GDocument ();
unknown_property.serialize (ndoc);
- if (ndoc.document_element.child_nodes.size != 2) {
- stdout.printf (@"ERROR: Root incorrect child node number: found
'$(doc.document_element.children.size)\n");
- foreach (GXml.xNode rn in ndoc.document_element.child_nodes) {
+ if (ndoc.root.children.size != 2) {
+ stdout.printf (@"ERROR: Root incorrect child node number: found
'$(doc.root.children.size)\n");
+ foreach (GXml.Node rn in ndoc.root.children) {
string nv = "__NULL__";
- if (rn.node_value != null)
- nv = rn.node_value;
- stdout.printf (@"Node: $(rn.node_name) / Value: '$(nv)'\n");
+ if (rn.value != null)
+ nv = rn.value;
+ stdout.printf (@"Node: $(rn.name) / Value: '$(nv)'\n");
}
stdout.printf (@"$(ndoc)\n");
assert_not_reached ();
}
- foreach (GXml.xNode n in ndoc.document_element.child_nodes) {
+ foreach (GXml.Node n in ndoc.root.children) {
if (n is Text) {
- if (n.node_value != "TEXT") {
- stdout.printf (@"ERROR: Unknown Text xElement not set: found
'$(n.node_value)\n");
+ if (n.value != "TEXT") {
+ stdout.printf (@"ERROR: Unknown Text GElement not set: found '$(n.value)\n");
assert_not_reached ();
}
}
@@ -1037,7 +1037,7 @@ class SerializableObjectModelTest : GXmlTest
Test.add_func ("/gxml/serializable/object_model/deserialize_incorrect_uint",
() => {
try {
- var doc = new xDocument.from_string (
+ var doc = new GDocument.from_string (
"""<?xml version="1.0"?>
<PACKAGE source="Mexico/North" destiny="Brazil" Hope="2/4.04">
<manual document="Sales Card" pages="1">Selling Card Specification</manual>
@@ -1057,9 +1057,9 @@ class SerializableObjectModelTest : GXmlTest
Test.add_func ("/gxml/serializable/object_model/set_namespace", () => {
try {
var ns = new NameSpace ();
- var doc = new xDocument ();
+ var doc = new GDocument ();
ns.serialize (doc);
- assert (doc.document_element.to_string () == "<gxml:namespace
xmlns:gxml=\"http://www.gnome.org/GXml\"/>");
+ assert (doc.root.to_string () == "<gxml:namespace xmlns:gxml=\"http://www.gnome.org/GXml\"/>");
} catch (GLib.Error e) {
#if DEBUG
GLib.message ("ERROR: "+e.message);
@@ -1070,7 +1070,7 @@ class SerializableObjectModelTest : GXmlTest
Test.add_func ("/gxml/serializable/object_model/find-unknown_property", () => {
try {
var p = new Package ();
- var doc = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc = new GDocument.from_string ("""<?xml version="1.0"?>
<PACKAGE source="Mexico/North" destiny="Brazil" Unknown="2/4.04">
<manual document="Sales Card" pages="1">Selling Card Specification</manual>
<Computer manufacturer="BoxingLAN" model="J24-EX9" cores="32" ghz="1.8"/>
@@ -1091,18 +1091,18 @@ UNKNOWN CONTENT
}
});
}
- static void serialize_manual_check (xElement element, Manual manual)
+ static void serialize_manual_check (GElement element, Manual manual)
{
- var document = element.get_attribute_node ("document");
+ var document = element.get_attr ("document");
if (document == null) assert_not_reached ();
- if (document.node_value != manual.document) {
- stdout.printf (@"ERROR MANUAL: document: $(document.node_value)\n");
+ if (document.value != manual.document) {
+ stdout.printf (@"ERROR MANUAL: document: $(document.value)\n");
assert_not_reached ();
}
- var pages = element.get_attribute_node ("pages");
+ var pages = element.get_attr ("pages");
if (pages == null) assert_not_reached ();
- if (int.parse (pages.node_value) != manual.pages) {
- stdout.printf (@"ERROR MANUAL: pages: $(pages.node_value)\n");
+ if (int.parse (pages.value) != manual.pages) {
+ stdout.printf (@"ERROR MANUAL: pages: $(pages.value)\n");
assert_not_reached ();
}
if (element.content != manual.get_contents ()) {
diff --git a/test/SerializablePropertyBoolTest.vala b/test/SerializablePropertyBoolTest.vala
index 882a523..7e5c9a6 100644
--- a/test/SerializablePropertyBoolTest.vala
+++ b/test/SerializablePropertyBoolTest.vala
@@ -38,15 +38,15 @@ class SerializablePropertyBoolTest : GXmlTest {
() => {
try {
var bn = new BoolNode ();
- var doc = new xDocument ();
+ var doc = new GDocument ();
bn.serialize (doc);
Test.message ("XML:\n"+doc.to_string ());
- var element = doc.document_element;
- var b = element.get_attribute_node ("boolean");
+ var element = doc.root as Element;
+ var b = element.get_attr ("boolean");
assert (b == null);
- var s = element.get_attribute_node ("name");
+ var s = element.get_attr ("name");
assert (s == null);
- var i = element.get_attribute_node ("integer");
+ var i = element.get_attr ("integer");
assert (i.value == "0");
} catch (GLib.Error e) {
Test.message (@"ERROR: $(e.message)");
@@ -57,43 +57,43 @@ class SerializablePropertyBoolTest : GXmlTest {
() => {
try {
var bn = new BoolNode ();
- var doc = new xDocument ();
+ var doc = new GDocument ();
bn.serialize (doc);
Test.message ("XML:\n"+doc.to_string ());
- var element = doc.document_element;
- var b = element.get_attribute_node ("boolean");
+ var element = doc.root as Element;
+ var b = element.get_attr ("boolean");
assert (b == null);
- var s = element.get_attribute_node ("name");
+ var s = element.get_attr ("name");
assert (s == null);
- var i = element.get_attribute_node ("integer");
+ var i = element.get_attr ("integer");
assert (i.value == "0");
// Change values
bn.boolean = new SerializableBool ();
// set to TRUE
bn.boolean.set_value (true);
- var doc2 = new xDocument ();
+ var doc2 = new GDocument ();
bn.serialize (doc2);
Test.message ("XML2:\n"+doc2.to_string ());
- var element2 = doc2.document_element;
- var b2 = element2.get_attribute_node ("boolean");
+ var element2 = doc2.root as Element;
+ var b2 = element2.get_attr ("boolean");
assert (b2 != null);
assert (b2.value == "true");
// set to FALSE
bn.boolean.set_value (false);
- var doc3 = new xDocument ();
+ var doc3 = new GDocument ();
bn.serialize (doc3);
Test.message ("XML3:\n"+doc3.to_string ());
- var element3 = doc3.document_element;
- var b3 = element3.get_attribute_node ("boolean");
+ var element3 = doc3.root as Element;
+ var b3 = element3.get_attr ("boolean");
assert (b3 != null);
assert (b3.value == "false");
// set to NULL/IGNORE
bn.boolean.set_serializable_property_value (null);
- var doc4= new xDocument ();
+ var doc4= new GDocument ();
bn.serialize (doc4);
Test.message ("XML3:\n"+doc4.to_string ());
- var element4 = doc4.document_element;
- var b4 = element4.get_attribute_node ("boolean");
+ var element4 = doc4.root as Element;
+ var b4 = element4.get_attr ("boolean");
assert (b4 == null);
} catch (GLib.Error e) {
Test.message (@"ERROR: $(e.message)");
@@ -103,7 +103,7 @@ class SerializablePropertyBoolTest : GXmlTest {
Test.add_func ("/gxml/serializable/Bool/deserialize/basic",
() => {
try {
- var doc1 = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc1 = new GDocument.from_string ("""<?xml version="1.0"?>
<BooleanNode boolean="true"/>""");
var b = new BoolNode ();
b.deserialize (doc1);
@@ -117,19 +117,19 @@ class SerializablePropertyBoolTest : GXmlTest {
Test.add_func ("/gxml/serializable/Bool/deserialize/invalid",
() => {
try {
- var doc1 = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc1 = new GDocument.from_string ("""<?xml version="1.0"?>
<BooleanNode boolean="c"/>""");
var b1 = new BoolNode ();
b1.deserialize (doc1);
assert (b1.boolean.get_serializable_property_value () == "c");
assert (b1.boolean.get_value () == false);
- var doc2 = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc2 = new GDocument.from_string ("""<?xml version="1.0"?>
<BooleanNode boolean="TRUE"/>""");
var b2 = new BoolNode ();
b2.deserialize (doc2);
assert (b2.boolean.get_serializable_property_value () == "TRUE");
assert (b2.boolean.get_value () == true);
- var doc3 = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc3 = new GDocument.from_string ("""<?xml version="1.0"?>
<BooleanNode boolean="FALSE"/>""");
var b3 = new BoolNode ();
b3.deserialize (doc3);
diff --git a/test/SerializablePropertyDoubleTest.vala b/test/SerializablePropertyDoubleTest.vala
index fb40163..6cffb4c 100644
--- a/test/SerializablePropertyDoubleTest.vala
+++ b/test/SerializablePropertyDoubleTest.vala
@@ -39,13 +39,13 @@ class SerializablePropertyDoubleTest : GXmlTest {
() => {
try {
var bn = new DoubleNode ();
- var doc = new xDocument ();
+ var doc = new GDocument ();
bn.serialize (doc);
Test.message ("XML:\n"+doc.to_string ());
- var element = doc.document_element;
- var b = element.get_attribute_node ("DoubleValue");
+ var element = doc.root as Element;
+ var b = element.get_attr ("DoubleValue");
assert (b == null);
- var s = element.get_attribute_node ("name");
+ var s = element.get_attr ("name");
assert (s == null);
} catch (GLib.Error e) {
Test.message (@"ERROR: $(e.message)");
@@ -56,23 +56,23 @@ class SerializablePropertyDoubleTest : GXmlTest {
() => {
try {
var bn = new DoubleNode ();
- var doc = new xDocument ();
+ var doc = new GDocument ();
bn.serialize (doc);
Test.message ("XML:\n"+doc.to_string ());
- var element = doc.document_element;
- var b = element.get_attribute_node ("DoubleValue");
+ var element = doc.root as Element;
+ var b = element.get_attr ("DoubleValue");
assert (b == null);
- var s = element.get_attribute_node ("name");
+ var s = element.get_attr ("name");
assert (s == null);
// Change values
// set to 233.014
bn.double_value = new SerializableDouble ();
bn.double_value.set_value (233.014);
- var doc2 = new xDocument ();
+ var doc2 = new GDocument ();
bn.serialize (doc2);
Test.message ("XML2:\n"+doc2.to_string ());
- var element2 = doc2.document_element;
- var b2 = element2.get_attribute_node ("DoubleValue");
+ var element2 = doc2.root as Element;
+ var b2 = element2.get_attr ("DoubleValue");
assert (b2 != null);
assert (bn.double_value.get_value () == 233.014);
Test.message ("Value in xml: "+b2.value);
@@ -83,20 +83,20 @@ class SerializablePropertyDoubleTest : GXmlTest {
assert (bn.double_value.format ("%3.3f") == "233.014");
// set to -1
bn.double_value.set_value (-1.013);
- var doc3 = new xDocument ();
+ var doc3 = new GDocument ();
bn.serialize (doc3);
Test.message ("XML3:\n"+doc3.to_string ());
- var element3 = doc3.document_element;
- var b3 = element3.get_attribute_node ("DoubleValue");
+ var element3 = doc3.root as Element;
+ var b3 = element3.get_attr ("DoubleValue");
assert (b3 != null);
assert ("%2.3f".printf (double.parse (b3.value)) == "-1.013");
// set to NULL/IGNORE
bn.double_value.set_serializable_property_value (null);
- var doc4= new xDocument ();
+ var doc4= new GDocument ();
bn.serialize (doc4);
Test.message ("XML3:\n"+doc4.to_string ());
- var element4 = doc4.document_element;
- var b4 = element4.get_attribute_node ("DoubleValue");
+ var element4 = doc4.root as Element;
+ var b4 = element4.get_attr ("DoubleValue");
assert (b4 == null);
} catch (GLib.Error e) {
Test.message (@"ERROR: $(e.message)");
@@ -106,7 +106,7 @@ class SerializablePropertyDoubleTest : GXmlTest {
Test.add_func ("/gxml/serializable/Double/deserialize/basic",
() => {
try {
- var doc1 = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc1 = new GDocument.from_string ("""<?xml version="1.0"?>
<DoubleNode DoubleValue="3.1416"/>""");
var d = new DoubleNode ();
d.deserialize (doc1);
@@ -122,7 +122,7 @@ class SerializablePropertyDoubleTest : GXmlTest {
Test.add_func ("/gxml/serializable/Double/deserialize/bad-value",
() => {
try {
- var doc1 = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc1 = new GDocument.from_string ("""<?xml version="1.0"?>
<DoubleNode DoubleValue="a"/>""");
var d = new DoubleNode ();
d.deserialize (doc1);
diff --git a/test/SerializablePropertyEnumTest.vala b/test/SerializablePropertyEnumTest.vala
index 6ac2fac..b945bf2 100644
--- a/test/SerializablePropertyEnumTest.vala
+++ b/test/SerializablePropertyEnumTest.vala
@@ -58,15 +58,15 @@ class SerializablePropertyEnumTest : GXmlTest {
() => {
try {
var e = new EnumerationValues ();
- var doc = new xDocument ();
+ var doc = new GDocument ();
e.serialize (doc);
Test.message ("XML:\n"+doc.to_string ());
- var element = doc.document_element;
- var ee1 = element.get_attribute_node ("values");
+ var element = doc.root as Element;
+ var ee1 = element.get_attr ("values");
assert (ee1 == null);
- var s = element.get_attribute_node ("name");
+ var s = element.get_attr ("name");
assert (s == null);
- var i = element.get_attribute_node ("integer");
+ var i = element.get_attr ("integer");
assert (i.value == "0");
} catch (GLib.Error e) {
Test.message (@"ERROR: $(e.message)");
@@ -77,15 +77,15 @@ class SerializablePropertyEnumTest : GXmlTest {
() => {
try {
var e = new EnumerationValues ();
- var doc1 = new xDocument ();
+ var doc1 = new GDocument ();
e.serialize (doc1);
Test.message ("XML1:\n"+doc1.to_string ());
- var element1 = doc1.document_element;
- var ee1 = element1.get_attribute_node ("values");
+ var element1 = doc1.root as Element;
+ var ee1 = element1.get_attr ("values");
assert (ee1 == null);
- var s1 = element1.get_attribute_node ("name");
+ var s1 = element1.get_attr ("name");
assert (s1 == null);
- var i1 = element1.get_attribute_node ("integer");
+ var i1 = element1.get_attr ("integer");
assert (i1.value == "0");
// Getting value
Enum.Values v = Enum.Values.SER_ONE;
@@ -98,31 +98,31 @@ class SerializablePropertyEnumTest : GXmlTest {
assert (e.values.get_value () == Enum.Values.SER_THREE);
Test.message ("Actual value= "+e.values.to_string ());
assert (e.values.to_string () == "SerThree");
- var d2 = new xDocument ();
+ var d2 = new GDocument ();
e.serialize (d2);
Test.message ("XML2:\n"+d2.to_string ());
- var element2 = d2.document_element;
- var ee2 = element2.get_attribute_node ("values");
+ var element2 = d2.root as Element;
+ var ee2 = element2.get_attr ("values");
assert (ee2 != null);
assert (ee2.value == "SerThree");
e.values.set_value (Enum.Values.SER_TWO);
assert (e.values.get_value () == Enum.Values.SER_TWO);
Test.message ("Actual value= "+e.values.to_string ());
assert (e.values.to_string () == "SerTwo");
- var d3 = new xDocument ();
+ var d3 = new GDocument ();
e.serialize (d3);
Test.message ("XML3:\n"+d3.to_string ());
- var element3 = d3.document_element;
- var ee3 = element3.get_attribute_node ("values");
+ var element3 = d3.root as Element;
+ var ee3 = element3.get_attr ("values");
assert (ee3 != null);
assert (ee3.value == "SerTwo");
// ignore
e.values.set_string (null);
- var d4 = new xDocument ();
+ var d4 = new GDocument ();
e.serialize (d4);
Test.message ("XML4:\n"+d4.to_string ());
- var element4 = d4.document_element;
- var ee4 = element4.get_attribute_node ("values");
+ var element4 = d4.root as Element;
+ var ee4 = element4.get_attr ("values");
assert (ee4 == null);
} catch (GLib.Error e) {
Test.message (@"ERROR: $(e.message)");
@@ -147,21 +147,21 @@ class SerializablePropertyEnumTest : GXmlTest {
var e = new EnumerationValues ();
e.values = new Enum ();
e.values.set_value (Enum.Values.AP);
- var d1 = new xDocument ();
+ var d1 = new GDocument ();
e.serialize (d1);
Test.message ("XML1: "+d1.to_string ());
- var d2 = new xDocument.from_string ("""<?xml version="1.0"?>
+ var d2 = new GDocument.from_string ("""<?xml version="1.0"?>
<Enum optionalvalues="SerExtension"/>""");
e.deserialize (d2);
assert (e.optional_values.get_value () == Enum.Values.SER_EXTENSION);
- var d3 = new xDocument ();
+ var d3 = new GDocument ();
e.serialize (d3);
Test.message ("XML2: "+d3.to_string ());
- var d4 = new xDocument.from_string ("""<?xml version="1.0"?>
+ var d4 = new GDocument.from_string ("""<?xml version="1.0"?>
<Enum OPTIONALVALUES="SERTHREE"/>""");
e.deserialize (d4);
assert (e.optional_values.get_value () == Enum.Values.SER_THREE);
- var d5 = new xDocument ();
+ var d5 = new GDocument ();
e.serialize (d5);
Test.message ("XML3: "+d5.to_string ());
} catch (GLib.Error e) {
diff --git a/test/SerializablePropertyFloatTest.vala b/test/SerializablePropertyFloatTest.vala
index d70aeef..5b0a24e 100644
--- a/test/SerializablePropertyFloatTest.vala
+++ b/test/SerializablePropertyFloatTest.vala
@@ -39,13 +39,13 @@ class SerializablePropertyFloatTest : GXmlTest {
() => {
try {
var bn = new FloatNode ();
- var doc = new xDocument ();
+ var doc = new GDocument ();
bn.serialize (doc);
Test.message ("XML:\n"+doc.to_string ());
- var element = doc.document_element;
- var b = element.get_attribute_node ("FloatValue");
+ var element = doc.root as Element;
+ var b = element.get_attr ("FloatValue");
assert (b == null);
- var s = element.get_attribute_node ("name");
+ var s = element.get_attr ("name");
assert (s == null);
} catch (GLib.Error e) {
Test.message (@"ERROR: $(e.message)");
@@ -56,23 +56,23 @@ class SerializablePropertyFloatTest : GXmlTest {
() => {
try {
var bn = new FloatNode ();
- var doc = new xDocument ();
+ var doc = new GDocument ();
bn.serialize (doc);
Test.message ("XML:\n"+doc.to_string ());
- var element = doc.document_element;
- var b = element.get_attribute_node ("FloatValue");
+ var element = doc.root as Element;
+ var b = element.get_attr ("FloatValue");
assert (b == null);
- var s = element.get_attribute_node ("name");
+ var s = element.get_attr ("name");
assert (s == null);
// Change values
bn.float_value = new SerializableFloat ();
// set to 233.014
bn.float_value.set_value ((float) 233.014);
- var doc2 = new xDocument ();
+ var doc2 = new GDocument ();
bn.serialize (doc2);
Test.message ("XML2:\n"+doc2.to_string ());
- var element2 = doc2.document_element;
- var b2 = element2.get_attribute_node ("FloatValue");
+ var element2 = doc2.root as Element;
+ var b2 = element2.get_attr ("FloatValue");
assert (b2 != null);
assert (bn.float_value.get_value () == (float) 233.014);
Test.message ("Value in xml: "+b2.value);
@@ -83,20 +83,20 @@ class SerializablePropertyFloatTest : GXmlTest {
assert (bn.float_value.format ("%3.3f") == "233.014");
// set to -1
bn.float_value.set_value ((float) (-1.013));
- var doc3 = new xDocument ();
+ var doc3 = new GDocument ();
bn.serialize (doc3);
Test.message ("XML3:\n"+doc3.to_string ());
- var element3 = doc3.document_element;
- var b3 = element3.get_attribute_node ("FloatValue");
+ var element3 = doc3.root as Element;
+ var b3 = element3.get_attr ("FloatValue");
assert (b3 != null);
assert ("%2.3f".printf (double.parse (b3.value)) == "-1.013");
// set to NULL/IGNORE
bn.float_value.set_serializable_property_value (null);
- var doc4= new xDocument ();
+ var doc4= new GDocument ();
bn.serialize (doc4);
Test.message ("XML3:\n"+doc4.to_string ());
- var element4 = doc4.document_element;
- var b4 = element4.get_attribute_node ("FloatValue");
+ var element4 = doc4.root as Element;
+ var b4 = element4.get_attr ("FloatValue");
assert (b4 == null);
} catch (GLib.Error e) {
Test.message (@"ERROR: $(e.message)");
@@ -106,7 +106,7 @@ class SerializablePropertyFloatTest : GXmlTest {
Test.add_func ("/gxml/serializable/Float/deserialize/basic",
() => {
try {
- var doc1 = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc1 = new GDocument.from_string ("""<?xml version="1.0"?>
<FloatNode FloatValue="3.1416"/>""");
var f = new FloatNode ();
f.deserialize (doc1);
@@ -122,7 +122,7 @@ class SerializablePropertyFloatTest : GXmlTest {
Test.add_func ("/gxml/serializable/Float/deserialize/aditional",
() => {
try {
- var doc1 = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc1 = new GDocument.from_string ("""<?xml version="1.0"?>
<FloatNode FloatValue="3.1416"/>""");
var d = new FloatNode ();
d.deserialize (doc1);
@@ -140,7 +140,7 @@ class SerializablePropertyFloatTest : GXmlTest {
Test.add_func ("/gxml/serializable/Float/deserialize/bad-value",
() => {
try {
- var doc1 = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc1 = new GDocument.from_string ("""<?xml version="1.0"?>
<FloatNode FloatValue="a"/>""");
var d = new FloatNode ();
d.deserialize (doc1);
diff --git a/test/SerializablePropertyIntTest.vala b/test/SerializablePropertyIntTest.vala
index 913ebfa..9297fb0 100644
--- a/test/SerializablePropertyIntTest.vala
+++ b/test/SerializablePropertyIntTest.vala
@@ -39,13 +39,13 @@ class SerializablePropertyIntTest : GXmlTest {
() => {
try {
var bn = new IntNode ();
- var doc = new xDocument ();
+ var doc = new GDocument ();
bn.serialize (doc);
Test.message ("XML:\n"+doc.to_string ());
- var element = doc.document_element;
- var b = element.get_attribute_node ("IntegerValue");
+ var element = doc.root as Element;
+ var b = element.get_attr ("IntegerValue");
assert (b == null);
- var s = element.get_attribute_node ("name");
+ var s = element.get_attr ("name");
assert (s == null);
} catch (GLib.Error e) {
Test.message (@"ERROR: $(e.message)");
@@ -56,41 +56,41 @@ class SerializablePropertyIntTest : GXmlTest {
() => {
try {
var bn = new IntNode ();
- var doc = new xDocument ();
+ var doc = new GDocument ();
bn.serialize (doc);
Test.message ("XML:\n"+doc.to_string ());
- var element = doc.document_element;
- var b = element.get_attribute_node ("IntegerValue");
+ var element = doc.root as Element;
+ var b = element.get_attr ("IntegerValue");
assert (b == null);
- var s = element.get_attribute_node ("name");
+ var s = element.get_attr ("name");
assert (s == null);
// Change values
bn.integer = new SerializableInt ();
// set to 233
bn.integer.set_value (233);
- var doc2 = new xDocument ();
+ var doc2 = new GDocument ();
bn.serialize (doc2);
Test.message ("XML2:\n"+doc2.to_string ());
- var element2 = doc2.document_element;
- var b2 = element2.get_attribute_node ("IntegerValue");
+ var element2 = doc2.root as Element;
+ var b2 = element2.get_attr ("IntegerValue");
assert (b2 != null);
assert (b2.value == "233");
// set to -1
bn.integer.set_value (-1);
- var doc3 = new xDocument ();
+ var doc3 = new GDocument ();
bn.serialize (doc3);
Test.message ("XML3:\n"+doc3.to_string ());
- var element3 = doc3.document_element;
- var b3 = element3.get_attribute_node ("IntegerValue");
+ var element3 = doc3.root as Element;
+ var b3 = element3.get_attr ("IntegerValue");
assert (b3 != null);
assert (b3.value == "-1");
// set to NULL/IGNORE
bn.integer.set_serializable_property_value (null);
- var doc4= new xDocument ();
+ var doc4= new GDocument ();
bn.serialize (doc4);
Test.message ("XML3:\n"+doc4.to_string ());
- var element4 = doc4.document_element;
- var b4 = element4.get_attribute_node ("IntegerValue");
+ var element4 = doc4.root as Element;
+ var b4 = element4.get_attr ("IntegerValue");
assert (b4 == null);
} catch (GLib.Error e) {
Test.message (@"ERROR: $(e.message)");
@@ -100,7 +100,7 @@ class SerializablePropertyIntTest : GXmlTest {
Test.add_func ("/gxml/serializable/Int/deserialize/basic",
() => {
try {
- var doc1 = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc1 = new GDocument.from_string ("""<?xml version="1.0"?>
<IntNode IntegerValue="1416"/>""");
var i = new IntNode ();
i.deserialize (doc1);
@@ -118,7 +118,7 @@ class SerializablePropertyIntTest : GXmlTest {
Test.add_func ("/gxml/serializable/Int/deserialize/bad-value",
() => {
try {
- var doc1 = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc1 = new GDocument.from_string ("""<?xml version="1.0"?>
<IntNode IntegerValue="a"/>""");
var i1 = new IntNode ();
i1.deserialize (doc1);
@@ -126,7 +126,7 @@ class SerializablePropertyIntTest : GXmlTest {
assert (i1.integer.get_serializable_property_value () == "a");
Test.message ("Actual value parse: "+i1.integer.get_value ().to_string ());
assert (i1.integer.get_value () == 0);
- var doc2 = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc2 = new GDocument.from_string ("""<?xml version="1.0"?>
<IntNode IntegerValue="1.1"/>""");
var i2 = new IntNode ();
i2.deserialize (doc2);
@@ -134,7 +134,7 @@ class SerializablePropertyIntTest : GXmlTest {
assert (i2.integer.get_serializable_property_value () == "1.1");
Test.message ("Actual value parse: "+i2.integer.get_value ().to_string ());
assert (i2.integer.get_value () == 1);
- var doc3 = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc3 = new GDocument.from_string ("""<?xml version="1.0"?>
<IntNode IntegerValue="1a"/>""");
var i3 = new IntNode ();
i3.deserialize (doc3);
diff --git a/test/SerializablePropertyValueListTest.vala b/test/SerializablePropertyValueListTest.vala
index a0b0472..f5cbc6e 100644
--- a/test/SerializablePropertyValueListTest.vala
+++ b/test/SerializablePropertyValueListTest.vala
@@ -55,17 +55,17 @@ class SerializablePropertyValueListTest : GXmlTest {
() => {
try {
var vl = new ValueList ();
- var doc = new xDocument ();
+ var doc = new GDocument ();
vl.serialize (doc);
Test.message ("XML:\n"+doc.to_string ());
- var element = doc.document_element;
- var evl1 = element.get_attribute_node ("values");
+ var element = doc.root as Element;
+ var evl1 = element.get_attr ("values");
assert (evl1 == null);
- var evl2 = element.get_attribute_node ("vals");
+ var evl2 = element.get_attr ("vals");
assert (evl2 == null);
- var s = element.get_attribute_node ("name");
+ var s = element.get_attr ("name");
assert (s == null);
- var i = element.get_attribute_node ("integer");
+ var i = element.get_attr ("integer");
assert (i.value == "0");
} catch (GLib.Error e) {
Test.message (@"ERROR: $(e.message)");
@@ -76,15 +76,15 @@ class SerializablePropertyValueListTest : GXmlTest {
() => {
try {
var vl = new ValueList ();
- var doc1 = new xDocument ();
+ var doc1 = new GDocument ();
vl.serialize (doc1);
Test.message ("XML1:\n"+doc1.to_string ());
- var element1 = doc1.document_element;
- var evl1 = element1.get_attribute_node ("values");
+ var element1 = doc1.root as Element;
+ var evl1 = element1.get_attr ("values");
assert (evl1 == null);
- var s1 = element1.get_attribute_node ("name");
+ var s1 = element1.get_attr ("name");
assert (s1 == null);
- var i1 = element1.get_attribute_node ("integer");
+ var i1 = element1.get_attr ("integer");
assert (i1.value == "0");
// Adding values
vl.values = new SerializableValueList ();
@@ -95,30 +95,30 @@ class SerializablePropertyValueListTest : GXmlTest {
assert (v == "Temp1");
v = vl.values.get_value_at (1);
assert (v == "Temp2");
- var doc2 = new xDocument ();
+ var doc2 = new GDocument ();
vl.serialize (doc2);
Test.message ("XML2:\n"+doc2.to_string ());
- var element2 = doc2.document_element;
- var evl2 = element2.get_attribute_node ("values");
+ var element2 = doc2.root as Element;
+ var evl2 = element2.get_attr ("values");
assert (evl2 == null);
// Select a value
vl.values.select_value_at (1);
v = vl.values.get_serializable_property_value ();
assert (v == "Temp2");
- var doc3 = new xDocument ();
+ var doc3 = new GDocument ();
vl.serialize (doc3);
Test.message ("XML3:\n"+doc3.to_string ());
- var element3 = doc3.document_element;
- var evl3 = element3.get_attribute_node ("values");
+ var element3 = doc3.root as Element;
+ var evl3 = element3.get_attr ("values");
assert (evl3 != null);
assert (evl3.value == "Temp2");
// Set value to null/ignore
vl.values.set_serializable_property_value (null);
- var doc4 = new xDocument ();
+ var doc4 = new GDocument ();
vl.serialize (doc4);
Test.message ("XML4:\n"+doc4.to_string ());
- var element4 = doc4.document_element;
- var evl4 = element4.get_attribute_node ("values");
+ var element4 = doc4.root as Element;
+ var evl4 = element4.get_attr ("values");
assert (evl4 == null);
} catch (GLib.Error e) {
Test.message (@"ERROR: $(e.message)");
@@ -128,7 +128,7 @@ class SerializablePropertyValueListTest : GXmlTest {
Test.add_func ("/gxml/serializable/ValueList/deserialize",
() => {
try {
- var doc1 = new xDocument.from_string ("""<?xml version="1.0"?>
+ var doc1 = new GDocument.from_string ("""<?xml version="1.0"?>
<options values="Temp1"/>""");
var vl = new ValueList ();
vl.deserialize (doc1);
@@ -149,15 +149,15 @@ class SerializablePropertyValueListTest : GXmlTest {
try {
var vl = new ValueList ();
vl.values = new SerializableValueList ();
- var doc1 = new xDocument ();
+ var doc1 = new GDocument ();
vl.serialize (doc1);
Test.message ("XML1:\n"+doc1.to_string ());
- var element1 = doc1.document_element;
- var evl1 = element1.get_attribute_node ("values");
+ var element1 = doc1.root as Element;
+ var evl1 = element1.get_attr ("values");
assert (evl1 == null);
- var s1 = element1.get_attribute_node ("name");
+ var s1 = element1.get_attr ("name");
assert (s1 == null);
- var i1 = element1.get_attribute_node ("integer");
+ var i1 = element1.get_attr ("integer");
assert (i1.value == "0");
// Adding values
var v = vl.values.get_value_at (0);
@@ -167,30 +167,30 @@ class SerializablePropertyValueListTest : GXmlTest {
assert (v == "Temp1");
v = vl.values.get_value_at (1);
assert (v == "Temp2");
- var doc2 = new xDocument ();
+ var doc2 = new GDocument ();
vl.serialize (doc2);
Test.message ("XML2:\n"+doc2.to_string ());
- var element2 = doc2.document_element;
- var evl2 = element2.get_attribute_node ("values");
+ var element2 = doc2.root as Element;
+ var evl2 = element2.get_attr ("values");
assert (evl2 == null);
// Select a value
vl.values.select_value_at (1);
v = vl.values.get_serializable_property_value ();
assert (v == "Temp2");
- var doc3 = new xDocument ();
+ var doc3 = new GDocument ();
vl.serialize (doc3);
Test.message ("XML3:\n"+doc3.to_string ());
- var element3 = doc3.document_element;
- var evl3 = element3.get_attribute_node ("values");
+ var element3 = doc3.root as Element;
+ var evl3 = element3.get_attr ("values");
assert (evl3 != null);
assert (evl3.value == "Temp2");
// Set value to null/ignore
vl.values.set_serializable_property_value (null);
- var doc4 = new xDocument ();
+ var doc4 = new GDocument ();
vl.serialize (doc4);
Test.message ("XML4:\n"+doc4.to_string ());
- var element4 = doc4.document_element;
- var evl4 = element4.get_attribute_node ("values");
+ var element4 = doc4.root as Element;
+ var evl4 = element4.get_attr ("values");
assert (evl4 == null);
} catch (GLib.Error e) {
Test.message (@"ERROR: $(e.message)");
@@ -227,11 +227,11 @@ class SerializablePropertyValueListTest : GXmlTest {
var vl = new ValueList ();
vl.vals = new Values ();
vl.vals.select_value_at (Values.Enum.VAL1);
- var doc = new xDocument ();
+ var doc = new GDocument ();
vl.serialize (doc);
Test.message ("XML:\n"+doc.to_string ());
- var element = doc.document_element;
- var s = element.get_attribute_node ("name");
+ var element = doc.root as Element;
+ var s = element.get_attr ("name");
assert (s == null);
var i = element.attrs.get ("integer");
assert (i.value == "0");
diff --git a/test/SerializableTest.vala b/test/SerializableTest.vala
index d5ae259..eb212b8 100644
--- a/test/SerializableTest.vala
+++ b/test/SerializableTest.vala
@@ -112,7 +112,7 @@ public class SerializableCapsicum : GXml.SerializableJson {
case "ratings":
this.ratings = new GLib.List<int> ();
foreach (GXml.xNode rating in element.child_nodes) {
- int64.try_parse (((GXml.xElement)rating).content, out outvalue);
+ int64.try_parse (((GXml.GElement)rating).content, out outvalue);
this.ratings.append ((int)outvalue.get_int64 ());
}
break;
@@ -123,14 +123,14 @@ public class SerializableCapsicum : GXml.SerializableJson {
}
private void serialize_unknown_property_type (GXml.Node elem, ParamSpec prop, out GXml.Node node)
{
- xElement element = (xElement) elem;
- xDocument doc = element.owner_document;
+ var element = (GElement) elem;
+ var doc = element.document;
switch (prop.name) {
case "ratings":
foreach (int rating_int in ratings) {
- xElement n = (xElement) doc.create_element ("rating");
+ GElement n = (GElement) doc.create_element ("rating");
n.content = "%d".printf (rating_int);
- element.append_child (n);
+ element.children.add (n);
}
break;
default:
@@ -232,7 +232,7 @@ class SerializableTest : GXmlTest {
Test.add_func ("/gxml/serializable/interface_defaults", () => {
try {
SerializableTomato tomato = new SerializableTomato (0, 0, 12, "cats");
- var doc = new xDocument ();
+ var doc = new GDocument ();
tomato.serialize (doc);
SerializableTomato tomato2 = new SerializableTomato (1,1,4,"dogs");
tomato2.deserialize (doc);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
