[gxml] Removing tests compilation warnings
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gxml] Removing tests compilation warnings
- Date: Thu, 29 Dec 2016 00:19:17 +0000 (UTC)
commit df0df5c2d1c04b439fc1ba17e0dc81d341e51b88
Author: Daniel Espinosa <esodan gmail com>
Date: Wed Dec 28 18:16:08 2016 -0600
Removing tests compilation warnings
test/DomGDocumentTest.vala | 140 +++++++-----
test/GAttributeTest.vala | 22 +-
test/GElementTest.vala | 19 +-
test/GomDocumentTest.vala | 7 +-
test/GomElementTest.vala | 21 ++-
test/GomSerializationTest.vala | 113 +++++++++-
test/SerializableObjectModelTest.vala | 391 +++++++++++++++++----------------
test/SerializableTest.vala | 27 ++-
test/TDocumentTest.vala | 19 +-
test/TElementTest.vala | 40 ++--
10 files changed, 480 insertions(+), 319 deletions(-)
---
diff --git a/test/DomGDocumentTest.vala b/test/DomGDocumentTest.vala
index a7a67b1..527224c 100644
--- a/test/DomGDocumentTest.vala
+++ b/test/DomGDocumentTest.vala
@@ -67,72 +67,92 @@ const string XMLDOC ="<?xml version=\"1.0\"?>
public static void add_tests () {
Test.add_func ("/gxml/dom/document/children", () => {
- GLib.message ("Doc: "+STRDOC);
- var doc = new GDocument.from_string (STRDOC) as DomDocument;
- DomElement root = doc.document_element;
- assert (root != null);
- assert (root is DomElement);
- assert (root.node_name == "Sentences");
- assert (root.has_child_nodes ());
- assert (root.children.size == 3);
- assert (root.children[0].node_name == "Sentence");
- assert (root.children[0].get_attribute ("lang") == "en");
- assert (root.children[0].node_value == "I like the colour blue.");
+ try {
+ GLib.message ("Doc: "+STRDOC);
+ var doc = new GDocument.from_string (STRDOC) as DomDocument;
+ DomElement root = doc.document_element;
+ assert (root != null);
+ assert (root is DomElement);
+ assert (root.node_name == "Sentences");
+ assert (root.has_child_nodes ());
+ assert (root.children.size == 3);
+ assert (root.children[0].node_name == "Sentence");
+ assert (root.children[0].get_attribute ("lang") == "en");
+ assert (root.children[0].node_value == "I like the colour blue.");
+ } catch (GLib.Error e) {
+ GLib.message ("Error: "+e.message);
+ assert_not_reached ();
+ }
});
Test.add_func ("/gxml/dom/document/child_nodes", () => {
- GLib.message ("Doc: "+STRDOC);
- var doc = new GDocument.from_string (STRDOC) as DomDocument;
- assert (doc is DomDocument);
- assert (doc.child_nodes != null);
- assert (doc.child_nodes.size == 2);
- assert (doc.child_nodes[0] is DomComment);
- assert (doc.child_nodes[1] is DomElement);
- assert (doc.child_nodes[1].node_name == "Sentences");
- assert (doc.document_element != null);
- assert (doc.document_element is DomElement);
- var auths = doc.document_element.children[2];
- assert (auths.node_name == "Authors");
- assert (auths.child_nodes.size == 5);
- assert (auths.child_nodes[4] is DomText);
+ try {
+ GLib.message ("Doc: "+STRDOC);
+ var doc = new GDocument.from_string (STRDOC) as DomDocument;
+ assert (doc is DomDocument);
+ assert (doc.child_nodes != null);
+ assert (doc.child_nodes.size == 2);
+ assert (doc.child_nodes[0] is DomComment);
+ assert (doc.child_nodes[1] is DomElement);
+ assert (doc.child_nodes[1].node_name == "Sentences");
+ assert (doc.document_element != null);
+ assert (doc.document_element is DomElement);
+ var auths = doc.document_element.children[2];
+ assert (auths.node_name == "Authors");
+ assert (auths.child_nodes.size == 5);
+ assert (auths.child_nodes[4] is DomText);
+ } catch (GLib.Error e) {
+ GLib.message ("Error: "+e.message);
+ assert_not_reached ();
+ }
});
Test.add_func ("/gxml/dom/document/element_collections", () => {
- GLib.message ("Doc: "+STRDOC);
- var doc = new GDocument.from_string (HTMLDOC) as DomDocument;
- assert (doc is DomDocument);
- var le = doc.get_elements_by_tag_name ("p");
- assert (le.size == 4);
- assert (le[0].get_attribute ("class") == "black");
- assert (le[1].get_attribute ("id") == "p01");
- var lc = doc.get_elements_by_class_name ("black");
- GLib.message ("DOC\n"+(doc as GDocument).to_string ());
- assert (lc.size == 2);
- assert (lc[0].node_name == "p");
- assert (lc[0].get_attribute ("class") == "black block");
- var nid = doc.get_element_by_id ("p01");
- assert (nid != null);
- assert (nid.node_name == "p");
- assert (nid.get_attribute ("id") == "p01");
+ try {
+ GLib.message ("Doc: "+STRDOC);
+ var doc = new GDocument.from_string (HTMLDOC) as DomDocument;
+ assert (doc is DomDocument);
+ var le = doc.get_elements_by_tag_name ("p");
+ assert (le.size == 4);
+ assert (le[0].get_attribute ("class") == "black");
+ assert (le[1].get_attribute ("id") == "p01");
+ var lc = doc.get_elements_by_class_name ("black");
+ GLib.message ("DOC\n"+(doc as GDocument).to_string ());
+ assert (lc.size == 2);
+ assert (lc[0].node_name == "p");
+ assert (lc[0].get_attribute ("class") == "black block");
+ var nid = doc.get_element_by_id ("p01");
+ assert (nid != null);
+ assert (nid.node_name == "p");
+ assert (nid.get_attribute ("id") == "p01");
+ } catch (GLib.Error e) {
+ GLib.message ("Error: "+e.message);
+ assert_not_reached ();
+ }
});
Test.add_func ("/gxml/dom/element/element_collections", () => {
- GLib.message ("Doc: "+HTMLDOC);
- var doc = new GDocument.from_string (HTMLDOC) as DomDocument;
- assert (doc is DomDocument);
- assert (doc.document_element.children.size == 1);
- var le = doc.document_element.get_elements_by_tag_name ("p");
- assert (le.size == 4);
- assert (le[0].get_attribute ("class") == "black");
- assert (le[1].get_attribute ("id") == "p01");
- var lc = doc.document_element.get_elements_by_class_name ("black");
- GLib.message("size"+lc.size.to_string ());
- assert (lc.size == 2);
- assert (lc[0].node_name == "p");
- assert ("black" in lc[0].get_attribute ("class"));
- var lc2 = doc.document_element.get_elements_by_class_name ("time");
- assert (lc2.size == 1);
- var lc3 = doc.document_element.get_elements_by_class_name ("time request");
- assert (lc3.size == 1);
- var lc4 = doc.document_element.get_elements_by_class_name ("time request hole");
- assert (lc4.size == 1);
+ try {
+ GLib.message ("Doc: "+HTMLDOC);
+ var doc = new GDocument.from_string (HTMLDOC) as DomDocument;
+ assert (doc is DomDocument);
+ assert (doc.document_element.children.size == 1);
+ var le = doc.document_element.get_elements_by_tag_name ("p");
+ assert (le.size == 4);
+ assert (le[0].get_attribute ("class") == "black");
+ assert (le[1].get_attribute ("id") == "p01");
+ var lc = doc.document_element.get_elements_by_class_name ("black");
+ GLib.message("size"+lc.size.to_string ());
+ assert (lc.size == 2);
+ assert (lc[0].node_name == "p");
+ assert ("black" in lc[0].get_attribute ("class"));
+ var lc2 = doc.document_element.get_elements_by_class_name ("time");
+ assert (lc2.size == 1);
+ var lc3 = doc.document_element.get_elements_by_class_name ("time request");
+ assert (lc3.size == 1);
+ var lc4 = doc.document_element.get_elements_by_class_name ("time request
hole");
+ assert (lc4.size == 1);
+ } catch (GLib.Error e) {
+ GLib.message ("Error: "+e.message);
+ assert_not_reached ();
+ }
});
Test.add_func ("/gxml/dom/node", () => {
try {
diff --git a/test/GAttributeTest.vala b/test/GAttributeTest.vala
index 54cc94c..28db4f2 100644
--- a/test/GAttributeTest.vala
+++ b/test/GAttributeTest.vala
@@ -118,16 +118,18 @@ class GAttributeTest : GXmlTest {
}
});
Test.add_func ("/gxml/tw-attribute/parent", () => {
- var doc = new GDocument ();
- var e = doc.create_element ("root");
- doc.children_nodes.add (e);
- var c = doc.create_element ("child");
- e.children_nodes.add (c);
- (e as GXml.Element).set_attr ("attr", "val");
- assert (doc.root != null);
- assert (doc.root.attrs["attr"] != null);
- assert (doc.root.attrs["attr"].parent != null);
- assert (doc.root.attrs["attr"].parent.name == "root");
+ try {
+ var doc = new GDocument ();
+ var e = doc.create_element ("root");
+ doc.children_nodes.add (e);
+ var c = doc.create_element ("child");
+ e.children_nodes.add (c);
+ (e as GXml.Element).set_attr ("attr", "val");
+ assert (doc.root != null);
+ assert (doc.root.attrs["attr"] != null);
+ assert (doc.root.attrs["attr"].parent != null);
+ assert (doc.root.attrs["attr"].parent.name == "root"); }
+ catch (GLib.Error e) { GLib.message ("ERROR: "+e.message); }
});
}
}
diff --git a/test/GElementTest.vala b/test/GElementTest.vala
index 24e4098..139510e 100644
--- a/test/GElementTest.vala
+++ b/test/GElementTest.vala
@@ -144,13 +144,18 @@ class GElementTest : GXmlTest {
}
});
Test.add_func ("/gxml/gelement/parent", () => {
- var doc = new GDocument.from_string ("<root><child/></root>");
- assert (doc.root != null);
- assert (doc.root.parent is GXml.Node);
- assert (doc.root.parent is GXml.Document);
- assert (doc.root.children_nodes[0] != null);
- assert (doc.root.children_nodes[0].parent != null);
- assert (doc.root.children_nodes[0].parent.name == "root");
+ try {
+ var doc = new GDocument.from_string ("<root><child/></root>");
+ assert (doc.root != null);
+ assert (doc.root.parent is GXml.Node);
+ assert (doc.root.parent is GXml.Document);
+ assert (doc.root.children_nodes[0] != null);
+ assert (doc.root.children_nodes[0].parent != null);
+ assert (doc.root.children_nodes[0].parent.name == "root");
+ } catch (GLib.Error e) {
+ Test.message (e.message);
+ assert_not_reached ();
+ }
});
}
}
diff --git a/test/GomDocumentTest.vala b/test/GomDocumentTest.vala
index 4f30646..5039e96 100644
--- a/test/GomDocumentTest.vala
+++ b/test/GomDocumentTest.vala
@@ -452,8 +452,13 @@ class GomDocumentTest : GXmlTest {
assert (doc.document_element.child_nodes.size == 1);
var c = doc.document_element.child_nodes[0] as DomElement;
assert (c is DomElement);
+ try {
c.set_attribute_ns ("http://www.w3.org/2000/xmlns/","xmlns:gxml2";,
-
"http://www.gnome.org/GXml2";);
+
"http://www.gnome.org/GXml2";); }
+ catch (GLib.Error e) {
+ GLib.message ("ERROR: "+e.message);
+ assert_not_reached ();
+ }
assert (c.attributes.size == 1);
assert (c.prefix == null);
assert (c.namespace_uri == null);
diff --git a/test/GomElementTest.vala b/test/GomElementTest.vala
index 9cce090..dedb4c4 100644
--- a/test/GomElementTest.vala
+++ b/test/GomElementTest.vala
@@ -131,8 +131,10 @@ class GomElementTest : GXmlTest {
assert (elem.get_attribute_ns ("http://www.gnome.org/GXml";, "xola") ==
"Mexico");
elem.remove_attribute_ns ("http://www.gnome.org/GXml";, "xola");
assert (elem.get_attribute_ns ("http://www.gnome.org/GXml";, "xola") == null);
+ assert (elem.get_attribute ("xola") == null);
assert (elem.attributes.size == 2);
try {
+ Test.message ("Documento:"+parser.write_string ());
elem.set_attribute_ns ("http://www.gnome.org/GXml";,
"gxml2:xola","Mexico");
assert_not_reached ();
} catch {}
@@ -177,13 +179,18 @@ class GomElementTest : GXmlTest {
}
});
Test.add_func ("/gxml/gom-element/parent", () => {
- var doc = new GomDocument.from_string ("<root><child/></root>");
- assert (doc.document_element != null);
- assert (doc.document_element.parent_node is GXml.DomNode);
- assert (doc.document_element.parent_node is GXml.DomDocument);
- assert (doc.document_element.child_nodes[0] != null);
- assert (doc.document_element.child_nodes[0].parent_node != null);
- assert (doc.document_element.child_nodes[0].parent_node.node_name == "root");
+ try {
+ var doc = new GomDocument.from_string ("<root><child/></root>");
+ assert (doc.document_element != null);
+ assert (doc.document_element.parent_node is GXml.DomNode);
+ assert (doc.document_element.parent_node is GXml.DomDocument);
+ assert (doc.document_element.child_nodes[0] != null);
+ assert (doc.document_element.child_nodes[0].parent_node != null);
+ assert (doc.document_element.child_nodes[0].parent_node.node_name == "root");
+ } catch (GLib.Error e) {
+ GLib.message ("Error: "+e.message);
+ assert_not_reached ();
+ }
});
}
}
diff --git a/test/GomSerializationTest.vala b/test/GomSerializationTest.vala
index 9371e78..3a1d44d 100644
--- a/test/GomSerializationTest.vala
+++ b/test/GomSerializationTest.vala
@@ -159,7 +159,14 @@ class GomSerializationTest : GXmlTest {
}
public string to_string () {
var parser = new XParser (this);
- return parser.write_string ();
+ string s = "";
+ try {
+ s = parser.write_string ();
+ } catch (GLib.Error e) {
+ GLib.message ("Error: "+e.message);
+ assert_not_reached ();
+ }
+ return s;
}
}
public class Computer : GomElement {
@@ -171,7 +178,14 @@ class GomSerializationTest : GXmlTest {
}
public string to_string () {
var parser = new XParser (this);
- return parser.write_string ();
+ string s = "";
+ try {
+ s = parser.write_string ();
+ } catch (GLib.Error e) {
+ GLib.message ("Error: "+e.message);
+ assert_not_reached ();
+ }
+ return s;
}
}
public class Taxes : GomElement {
@@ -186,7 +200,14 @@ class GomSerializationTest : GXmlTest {
}
public string to_string () {
var parser = new XParser (this);
- return parser.write_string ();
+ string s = "";
+ try {
+ s = parser.write_string ();
+ } catch (GLib.Error e) {
+ GLib.message ("Error: "+e.message);
+ assert_not_reached ();
+ }
+ return s;
}
public enum Month {
JANUARY,
@@ -205,7 +226,14 @@ class GomSerializationTest : GXmlTest {
}
public string to_string () {
var parser = new XParser (this);
- return parser.write_string ();
+ string s = "";
+ try {
+ s = parser.write_string ();
+ } catch (GLib.Error e) {
+ GLib.message ("Error: "+e.message);
+ assert_not_reached ();
+ }
+ return s;
}
}
public class BookStand : GomElement {
@@ -218,7 +246,14 @@ class GomSerializationTest : GXmlTest {
}
public string to_string () {
var parser = new XParser (this);
- return parser.write_string ();
+ string s = "";
+ try {
+ s = parser.write_string ();
+ } catch (GLib.Error e) {
+ GLib.message ("Error: "+e.message);
+ assert_not_reached ();
+ }
+ return s;
}
public class Registers : GomArrayList {
public Registers.initialize (BookStand stand) {
@@ -249,7 +284,14 @@ class GomSerializationTest : GXmlTest {
}
public string to_string () {
var parser = new XParser (this);
- return parser.write_string ();
+ string s = "";
+ try {
+ s = parser.write_string ();
+ } catch (GLib.Error e) {
+ GLib.message ("Error: "+e.message);
+ assert_not_reached ();
+ }
+ return s;
}
}
public class Motor : GomElement {
@@ -263,7 +305,14 @@ class GomSerializationTest : GXmlTest {
}
public string to_string () {
var parser = new XParser (this);
- return parser.write_string ();
+ string s = "";
+ try {
+ s = parser.write_string ();
+ } catch (GLib.Error e) {
+ GLib.message ("Error: "+e.message);
+ assert_not_reached ();
+ }
+ return s;
}
public enum TensionTypeEnum {
AC,
@@ -298,6 +347,7 @@ class GomSerializationTest : GXmlTest {
}
public static void add_tests () {
Test.add_func ("/gxml/gom-serialization/write/properties", () => {
+ try {
var b = new Book ();
var parser = new XParser (b);
string s = parser.write_string ();
@@ -307,6 +357,10 @@ class GomSerializationTest : GXmlTest {
assert (b.get_attribute ("name") == "My Book");
s = b.to_string ();
GLib.message ("DOC:"+s);
+ } catch (GLib.Error e) {
+ GLib.message ("Error: "+e.message);
+ assert_not_reached ();
+ }
});
Test.add_func ("/gxml/gom-serialization/write/property-ignore", () => {
var c = new Computer ();
@@ -323,6 +377,7 @@ class GomSerializationTest : GXmlTest {
GLib.message ("DOC:"+s);
});
Test.add_func ("/gxml/gom-serialization/write/property-long-name", () => {
+ try {
var t = new Taxes ();
string s = t.to_string ();
assert (s != null);
@@ -346,8 +401,13 @@ class GomSerializationTest : GXmlTest {
assert ("Month=\"february\"" in s);
assert ("TaxFree=\"true\"" in s);
GLib.message ("DOC:"+s);
+ } catch (GLib.Error e) {
+ GLib.message ("Error: "+e.message);
+ assert_not_reached ();
+ }
});
Test.add_func ("/gxml/gom-serialization/write/property-arraylist", () => {
+ try {
var bs = new BookStand ();
string s = bs.to_string ();
assert (s != null);
@@ -385,8 +445,13 @@ class GomSerializationTest : GXmlTest {
assert ((bs.registers.get_item (0) as BookRegister).year == 2016);
assert ((bs.registers.get_item (1) as BookRegister).year == 2010);
assert ((bs.registers.get_item (2) as BookRegister).year == 2000);
+ } catch (GLib.Error e) {
+ GLib.message ("Error: "+e.message);
+ assert_not_reached ();
+ }
});
Test.add_func ("/gxml/gom-serialization/write/property-hashmap", () => {
+ try {
var bs = new BookStore ();
string s = bs.to_string ();
assert (s != null);
@@ -431,8 +496,13 @@ class GomSerializationTest : GXmlTest {
assert ((bs.books.get("Title1") as Book).name == "Title1");
assert ((bs.books.get("Title2") as Book).name == "Title2");
assert ((bs.books.get("Title3") as Book).name == "Title3");
+ } catch (GLib.Error e) {
+ GLib.message ("Error: "+e.message);
+ assert_not_reached ();
+ }
});
Test.add_func ("/gxml/gom-serialization/write/gom-property", () => {
+ try {
var m = new Motor ();
string s = m.to_string ();
assert (s != null);
@@ -472,8 +542,13 @@ class GomSerializationTest : GXmlTest {
assert (s != null);
GLib.message ("DOC:"+s);
assert ("<Motor On=\"true\" Torque=\"3.1416\" Speed=\"3600.1011\" TensionType=\"dc\"
Tension=\"125\"/>" in s);
+ } catch (GLib.Error e) {
+ GLib.message ("Error: "+e.message);
+ assert_not_reached ();
+ }
});
Test.add_func ("/gxml/gom-serialization/read/properties", () => {
+ try {
var b = new Book ();
var parser = new XParser (b);
parser.read_string ("<book name=\"Loco\"/>", null);
@@ -495,6 +570,10 @@ class GomSerializationTest : GXmlTest {
assert (b.get_attribute ("name") == "My Book");
s = b.to_string ();
assert ("<Book Name=\"My Book\"/>" in s);
+ } catch (GLib.Error e) {
+ GLib.message ("Error: "+e.message);
+ assert_not_reached ();
+ }
});
Test.add_func ("/gxml/gom-serialization/read/bad-node-name", () => {
var b = new Book ();
@@ -505,6 +584,7 @@ class GomSerializationTest : GXmlTest {
} catch {}
});
Test.add_func ("/gxml/gom-serialization/read/object-property", () => {
+ try {
var b = new BookRegister ();
string s = b.to_string ();
GLib.message ("doc:"+s);
@@ -514,8 +594,13 @@ class GomSerializationTest : GXmlTest {
s = b.to_string ();
GLib.message ("doc:"+s);
assert ("<BookRegister Year=\"0\"><Book/></BookRegister>" in s);
+ } catch (GLib.Error e) {
+ GLib.message ("Error: "+e.message);
+ assert_not_reached ();
+ }
});
Test.add_func ("/gxml/gom-serialization/read/gom-property", () => {
+ try {
var m = new Motor ();
string s = m.to_string ();
GLib.message ("doc:"+s);
@@ -531,8 +616,13 @@ class GomSerializationTest : GXmlTest {
assert ("TensionType=\"dc\"" in s);
assert ("Tension=\"125\"" in s);
assert ("/>" in s);
+ } catch (GLib.Error e) {
+ GLib.message ("Error: "+e.message);
+ assert_not_reached ();
+ }
});
Test.add_func ("/gxml/gom-serialization/read/property-arraylist", () => {
+ try {
var bs = new BookStand ();
string s = bs.to_string ();
GLib.message ("doc:"+s);
@@ -559,8 +649,13 @@ class GomSerializationTest : GXmlTest {
assert ((bs.registers.get_item (0) as BookRegister).year == 2016);
assert ((bs.registers.get_item (1) as BookRegister).year == 2010);
assert ((bs.registers.get_item (2) as BookRegister).year == 2000);
+ } catch (GLib.Error e) {
+ GLib.message ("Error: "+e.message);
+ assert_not_reached ();
+ }
});
Test.add_func ("/gxml/gom-serialization/read/property-hashmap", () => {
+ try {
var bs = new BookStand ();
string s = bs.to_string ();
GLib.message ("doc:"+s);
@@ -598,6 +693,10 @@ class GomSerializationTest : GXmlTest {
assert (bs.books.get ("Title3") is DomElement);
assert (bs.books.get ("Title3") is Book);
assert (bs.books.get ("Title4") == null);
+ } catch (GLib.Error e) {
+ GLib.message ("Error: "+e.message);
+ assert_not_reached ();
+ }
});
Test.add_func ("/gxml/gom-serialization/multiple-child-collections", () => {
try {
diff --git a/test/SerializableObjectModelTest.vala b/test/SerializableObjectModelTest.vala
index eb7691f..e97f33e 100644
--- a/test/SerializableObjectModelTest.vala
+++ b/test/SerializableObjectModelTest.vala
@@ -131,7 +131,11 @@ public class Package : ObjectModel
{
for (int i = 0; i < tags.length; i++) {
var str = tags.index (i);
- node = (Element) element.document.create_element ("tag");
+ try { node = (Element) element.document.create_element ("tag"); }
+ catch (GLib.Error e) {
+ GLib.message ("Error: "+e.message);
+ assert_not_reached ();
+ }
((Element) node).content = str;
element.children_nodes.add (node);
}
@@ -502,34 +506,33 @@ class SerializableObjectModelTest : GXmlTest
}
);
Test.add_func ("/gxml/serializable/object_model/deserialize_array_property",
- () => {
- var doc = new GDocument.from_string (XML_PACKAGE_FILE);
- var package = new Package ();
- try {
- package.deserialize (doc);
- if (package.tags.length != 3) {
- stdout.printf (@"ERROR PACKAGE: tags length: $(package.tags.length)");
- assert_not_reached ();
- }
- if (package.tags.index (0) != "Printer") {
- stdout.printf (@"ERROR PACKAGE: tags index 0: $(package.tags.index (0))");
- assert_not_reached ();
- }
- if (package.tags.index (1) != "Partner") {
- stdout.printf (@"ERROR PACKAGE: tags index 1: $(package.tags.index (1))");
- assert_not_reached ();
- }
- if (package.tags.index (2) != "Support") {
- stdout.printf (@"ERROR PACKAGE: tags index 0: $(package.tags.index (2))");
- assert_not_reached ();
- }
- }
- catch (GLib.Error e) {
- GLib.message (@"Error: $(e.message)");
- assert_not_reached ();
- }
- }
- );
+ () => {
+ try {
+ var doc = new GDocument.from_string (XML_PACKAGE_FILE);
+ var package = new Package ();
+ package.deserialize (doc);
+ if (package.tags.length != 3) {
+ stdout.printf (@"ERROR PACKAGE: tags length: $(package.tags.length)");
+ assert_not_reached ();
+ }
+ if (package.tags.index (0) != "Printer") {
+ stdout.printf (@"ERROR PACKAGE: tags index 0: $(package.tags.index (0))");
+ assert_not_reached ();
+ }
+ if (package.tags.index (1) != "Partner") {
+ stdout.printf (@"ERROR PACKAGE: tags index 1: $(package.tags.index (1))");
+ assert_not_reached ();
+ }
+ if (package.tags.index (2) != "Support") {
+ stdout.printf (@"ERROR PACKAGE: tags index 0: $(package.tags.index (2))");
+ assert_not_reached ();
+ }
+ }
+ catch (GLib.Error e) {
+ GLib.message (@"Error: $(e.message)");
+ assert_not_reached ();
+ }
+ });
Test.add_func ("/gxml/serializable/object_model/serialize_array_property",
() => {
var doc = new GDocument ();
@@ -749,183 +752,183 @@ class SerializableObjectModelTest : GXmlTest
}
});
Test.add_func ("/gxml/serializable/object_model/override_deserialize",
- () => {
- 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 {
-#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.Namespace n in doc.root.namespaces) {
- stdout.printf (@"CONFIGURATION: namespace: $(n.uri)\n");
- }
-#endif
- assert_not_reached ();
- }
- }
- catch (GLib.Error e) {
- stdout.printf (@"Error: $(e.message)");
- assert_not_reached ();
- }
- });
+ () => {
+ try {
+ 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 ();
+ #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.Namespace n in doc.root.namespaces) {
+ stdout.printf (@"CONFIGURATION: namespace: $(n.uri)\n");
+ }
+ #endif
+ assert_not_reached ();
+ }
+ }
+ catch (GLib.Error e) {
+ stdout.printf (@"Error: $(e.message)");
+ assert_not_reached ();
+ }
+ });
Test.add_func ("/gxml/serializable/object_model/custome_node_name",
- () => {
- var doc = new GDocument.from_string ("""<?xml version="1.0"?><NodeName />""");
- var nodename = new NodeName ();
- try {
- nodename.deserialize (doc);
- }
- catch (GLib.Error e) {
- stdout.printf (@"Error: $(e.message)");
- assert_not_reached ();
- }
- });
+ () => {
+ try {
+ var doc = new GDocument.from_string ("""<?xml version="1.0"?><NodeName />""");
+ var nodename = new NodeName ();
+ nodename.deserialize (doc);
+ }
+ catch (GLib.Error e) {
+ stdout.printf (@"Error: $(e.message)");
+ assert_not_reached ();
+ }
+ });
Test.add_func ("/gxml/serializable/object_model/no_serialize_null_property",
- () => {
- 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.root as GElement).get_attr ("name");
- if (name != null) {
- stdout.printf (@"ERROR: NULL ATTRIBUTE SERIALIZATION: name found $(name.name)");
- assert_not_reached ();
- }
- var array = (doc.root as Element).get_attr ("array");
- if (array != null) {
- stdout.printf (@"ERROR: NULL ATTRIBUTE SERIALIZATION: array found $(array.name)");
- assert_not_reached ();
- }
- if (doc.root.children_nodes.size > 0) {
- stdout.printf (@"ERROR: NULL ATTRIBUTE SERIALIZATION: Nodes found
$(doc.root.children_nodes.size > 0)");
- assert_not_reached ();
- }
- }
- catch (GLib.Error e) {
- stdout.printf (@"Error: $(e.message)");
- assert_not_reached ();
- }
- });
+ () => {
+ try {
+ var doc = new GDocument();
+ var unknown_property = new UnknownAttribute (); // name is set to null
+ unknown_property.serialize (doc);
+ //stdout.printf (@"DOCUMENT: $doc"); assert_not_reached ();
+ var name = (doc.root as GElement).get_attr ("name");
+ if (name != null) {
+ stdout.printf (@"ERROR: NULL ATTRIBUTE SERIALIZATION: name found $(name.name)");
+ assert_not_reached ();
+ }
+ var array = (doc.root as Element).get_attr ("array");
+ if (array != null) {
+ stdout.printf (@"ERROR: NULL ATTRIBUTE SERIALIZATION: array found $(array.name)");
+ assert_not_reached ();
+ }
+ if (doc.root.children_nodes.size > 0) {
+ stdout.printf (@"ERROR: NULL ATTRIBUTE SERIALIZATION: Nodes found $(doc.root.children_nodes.size >
0)");
+ assert_not_reached ();
+ }
+ }
+ catch (GLib.Error e) {
+ stdout.printf (@"Error: $(e.message)");
+ assert_not_reached ();
+ }
+ });
Test.add_func ("/gxml/serializable/object_model/unknown_property",
- () => {
- 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");
+ () => {
+ try {
+ 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");
#if DEBUG
- GLib.message ("Document to use:\n"+doc.root.children_nodes.size.to_string ());
- foreach (GXml.Node n in doc.root.children_nodes) {
- GLib.message ("Node in root: "+ n.name+ " Contents: "+n.value);
- }
- GLib.message ("Document root children:\n"+doc.to_string ());
+ GLib.message ("Document to use:\n"+doc.root.children_nodes.size.to_string ());
+ foreach (GXml.Node n in doc.root.children_nodes) {
+ GLib.message ("Node in root: "+ n.name+ " Contents: "+n.value);
+ }
+ GLib.message ("Document root children:\n"+doc.to_string ());
#endif
- assert (doc.root.children_nodes.size == 2);
- var unknown_property = new UnknownAttribute ();
- try {
- unknown_property.deserialize (doc);
+ assert (doc.root.children_nodes.size == 2);
+ var unknown_property = new UnknownAttribute ();
+ unknown_property.deserialize (doc);
#if DEBUG
- GLib.message ("Checking unknown attributes...");
- foreach (GXml.Attribute a in unknown_property.unknown_serializable_properties.values)
{
- GLib.message (@"Unknown Attribute: $(a.name) = $(a.value)");
- }
- GLib.message ("Checking unknown nodes...");
- foreach (GXml.Node un in unknown_property.unknown_serializable_nodes) {
- GLib.message (@"Unknown Node: $(un.name) = $(un.to_string ())");
- }
+ GLib.message ("Checking unknown attributes...");
+ foreach (GXml.Attribute a in unknown_property.unknown_serializable_properties.values) {
+ GLib.message (@"Unknown Attribute: $(a.name) = $(a.value)");
+ }
+ GLib.message ("Checking unknown nodes...");
+ foreach (GXml.Node un in unknown_property.unknown_serializable_nodes) {
+ GLib.message (@"Unknown Node: $(un.name) = $(un.to_string ())");
+ }
#endif
- var ukp = unknown_property.unknown_serializable_properties;
- assert (ukp.size == 2);
- var ignore = ukp.get ("ignore");
- assert (ignore != null);
- var ignore2 = ukp.get ("ignore2");
- assert (ignore2 != null);
+ var ukp = unknown_property.unknown_serializable_properties;
+ assert (ukp.size == 2);
+ var ignore = ukp.get ("ignore");
+ assert (ignore != null);
+ var ignore2 = ukp.get ("ignore2");
+ assert (ignore2 != null);
#if DEBUG
- GLib.message (@"Unknown nodes = $(unknown_property.unknown_serializable_nodes.size)");
+ GLib.message (@"Unknown nodes = $(unknown_property.unknown_serializable_nodes.size)");
#endif
- assert (unknown_property.unknown_serializable_nodes.size == 2);
- bool foundn = false;
- bool foundt = false;
- GXml.Node unkn;
- foreach (GXml.Node n in unknown_property.unknown_serializable_nodes) {
- if (n.name == "UnknownNode") {
- foundn = true;
- assert (n.attrs.get ("toignore") != null);
- assert (n.attrs.get ("toignore").value == "true");
- }
- if (n is Text) {
- foundt = true;
- assert (n.value == "TEXT");
- }
- }
- assert (foundn);
- assert (foundt);
- }
- catch (GLib.Error e) {
- stdout.printf (@"Error: $(e.message)");
- assert_not_reached ();
- }
- });
+ assert (unknown_property.unknown_serializable_nodes.size == 2);
+ bool foundn = false;
+ bool foundt = false;
+ GXml.Node unkn;
+ foreach (GXml.Node n in unknown_property.unknown_serializable_nodes) {
+ if (n.name == "UnknownNode") {
+ foundn = true;
+ assert (n.attrs.get ("toignore") != null);
+ assert (n.attrs.get ("toignore").value == "true");
+ }
+ if (n is Text) {
+ foundt = true;
+ assert (n.value == "TEXT");
+ }
+ }
+ assert (foundn);
+ assert (foundt);
+ }
+ catch (GLib.Error e) {
+ stdout.printf (@"Error: $(e.message)");
+ assert_not_reached ();
+ }
+ });
Test.add_func ("/gxml/serializable/object_model/deserialize_unknown_property",
- () => {
- var doc = new GDocument.from_string ("""<?xml version="1.0"?>
- <UnknownAttribute ignore="true" ignore2="test">
- <UnknownNode direction = "fordward">
- <UnknownChild t = "test">
- <UnknownChildTwo t = "test">SECOND FAKE TEXT</UnknownChildTwo>
- </UnknownChild>
- </UnknownNode>FAKE TEXT</UnknownAttribute>""");
- assert (doc.root.name == "UnknownAttribute");
- assert (doc.root.children_nodes.size == 3);
- assert (doc.root.children_nodes[1].name == "UnknownNode");
- assert (doc.root.children_nodes[2].value == "FAKE TEXT");
- assert (doc.root.children_nodes[1].children_nodes.size == 3);
- assert (doc.root.children_nodes[1].children_nodes[1].name == "UnknownChild");
- assert (doc.root.children_nodes[1].children_nodes[1].children_nodes.size == 3);
- assert (doc.root.children_nodes[1].children_nodes[1].children_nodes[1].name ==
"UnknownChildTwo");
- assert
(doc.root.children_nodes[1].children_nodes[1].children_nodes[1].children_nodes.size == 1);
- assert
(doc.root.children_nodes[1].children_nodes[1].children_nodes[1].children_nodes[0] is GXml.Text);
- assert
(doc.root.children_nodes[1].children_nodes[1].children_nodes[1].children_nodes[0].value == "SECOND FAKE
TEXT");
- var unknown_property = new UnknownAttribute ();
- try {
- unknown_property.deserialize (doc);
- var doc2 = new GDocument ();
- unknown_property.serialize (doc2);
+ () => {
+ try {
+ var doc = new GDocument.from_string ("""<?xml version="1.0"?>
+ <UnknownAttribute ignore="true" ignore2="test">
+ <UnknownNode direction = "fordward">
+ <UnknownChild t = "test">
+ <UnknownChildTwo t = "test">SECOND FAKE TEXT</UnknownChildTwo>
+ </UnknownChild>
+ </UnknownNode>FAKE TEXT</UnknownAttribute>""");
+ assert (doc.root.name == "UnknownAttribute");
+ assert (doc.root.children_nodes.size == 3);
+ assert (doc.root.children_nodes[1].name == "UnknownNode");
+ assert (doc.root.children_nodes[2].value == "FAKE TEXT");
+ assert (doc.root.children_nodes[1].children_nodes.size == 3);
+ assert (doc.root.children_nodes[1].children_nodes[1].name == "UnknownChild");
+ assert (doc.root.children_nodes[1].children_nodes[1].children_nodes.size == 3);
+ assert (doc.root.children_nodes[1].children_nodes[1].children_nodes[1].name == "UnknownChildTwo");
+ assert (doc.root.children_nodes[1].children_nodes[1].children_nodes[1].children_nodes.size == 1);
+ assert (doc.root.children_nodes[1].children_nodes[1].children_nodes[1].children_nodes[0] is
GXml.Text);
+ assert (doc.root.children_nodes[1].children_nodes[1].children_nodes[1].children_nodes[0].value ==
"SECOND FAKE TEXT");
+ var unknown_property = new UnknownAttribute ();
+ unknown_property.deserialize (doc);
+ var doc2 = new GDocument ();
+ unknown_property.serialize (doc2);
#if DEBUG
- GLib.message ("Unknown nodes:");
- foreach (GXml.Node n in unknown_property.unknown_serializable_nodes) {
- GLib.message (@"Unknown node: '$(n.name)'");
- }
- GLib.message ("Prepare to Serialize...");
- GLib.message ("After Serialize...");
- GLib.message ("Serialized back document: \n"+doc2.libxml_to_string ());
+ GLib.message ("Unknown nodes:");
+ foreach (GXml.Node n in unknown_property.unknown_serializable_nodes) {
+ GLib.message (@"Unknown node: '$(n.name)'");
+ }
+ GLib.message ("Prepare to Serialize...");
+ GLib.message ("After Serialize...");
+ GLib.message ("Serialized back document: \n"+doc2.libxml_to_string ());
#endif
- assert (doc2.root != null);
- assert (doc.root.name == "UnknownAttribute");
- assert (doc2.root.children_nodes.size == 3);
- assert (doc2.root.children_nodes[1].name == "UnknownNode");
- assert (doc2.root.children_nodes[1].children_nodes.size == 3);
- assert (doc2.root.children_nodes[2].value == "FAKE TEXT");
- assert (doc2.root.children_nodes[1].children_nodes[1].name == "UnknownChild");
- assert (doc2.root.children_nodes[1].children_nodes[1].children_nodes[1].name ==
"UnknownChildTwo");
- assert (doc2.root.children_nodes[1].children_nodes[1].children_nodes.size == 3);
- assert
(doc2.root.children_nodes[1].children_nodes[1].children_nodes[1].children_nodes.size == 1);
- assert
(doc2.root.children_nodes[1].children_nodes[1].children_nodes[1].children_nodes[0] is GXml.Text);
- assert
(doc2.root.children_nodes[1].children_nodes[1].children_nodes[1].children_nodes[0].value == "SECOND FAKE
TEXT");
- }
- catch (GLib.Error e) {
- stdout.printf (@"Error: $(e.message)");
- assert_not_reached ();
- }
- });
+ assert (doc2.root != null);
+ assert (doc.root.name == "UnknownAttribute");
+ assert (doc2.root.children_nodes.size == 3);
+ assert (doc2.root.children_nodes[1].name == "UnknownNode");
+ assert (doc2.root.children_nodes[1].children_nodes.size == 3);
+ assert (doc2.root.children_nodes[2].value == "FAKE TEXT");
+ assert (doc2.root.children_nodes[1].children_nodes[1].name == "UnknownChild");
+ assert (doc2.root.children_nodes[1].children_nodes[1].children_nodes[1].name == "UnknownChildTwo");
+ assert (doc2.root.children_nodes[1].children_nodes[1].children_nodes.size == 3);
+ assert (doc2.root.children_nodes[1].children_nodes[1].children_nodes[1].children_nodes.size == 1);
+ assert (doc2.root.children_nodes[1].children_nodes[1].children_nodes[1].children_nodes[0] is
GXml.Text);
+ assert (doc2.root.children_nodes[1].children_nodes[1].children_nodes[1].children_nodes[0].value ==
"SECOND FAKE TEXT");
+ }
+ catch (GLib.Error e) {
+ stdout.printf (@"Error: $(e.message)");
+ assert_not_reached ();
+ }
+ });
Test.add_func ("/gxml/serializable/object_model/serialize_unknown_property",
() => {
try {
diff --git a/test/SerializableTest.vala b/test/SerializableTest.vala
index cf747ca..de5c53e 100644
--- a/test/SerializableTest.vala
+++ b/test/SerializableTest.vala
@@ -101,18 +101,23 @@ public class SerializableCapsicum : GXml.SerializableObjectModel {
}
private void serialize_unknown_property_type (GXml.Node elem, ParamSpec prop, out GXml.Node node)
{
- var element = (GElement) elem;
- var doc = element.document;
- switch (prop.name) {
- case "ratings":
- foreach (int rating_int in ratings) {
- GElement n = (GElement) doc.create_element ("rating");
- n.content = "%d".printf (rating_int);
- element.children.add (n);
+ try {
+ var element = (GElement) elem;
+ var doc = element.document;
+ switch (prop.name) {
+ case "ratings":
+ foreach (int rating_int in ratings) {
+ GElement n = (GElement) doc.create_element ("rating");
+ n.content = "%d".printf (rating_int);
+ element.children.add (n);
+ }
+ break;
+ default:
+ Test.message ("Wasn't expecting the SerializableCapsicum property '%s'",
prop.name);
+ assert_not_reached ();
}
- break;
- default:
- Test.message ("Wasn't expecting the SerializableCapsicum property '%s'", prop.name);
+ } catch (GLib.Error e) {
+ GLib.message ("Error: "+e.message);
assert_not_reached ();
}
}
diff --git a/test/TDocumentTest.vala b/test/TDocumentTest.vala
index 5f764aa..2c65afc 100644
--- a/test/TDocumentTest.vala
+++ b/test/TDocumentTest.vala
@@ -371,15 +371,20 @@ class TDocumentTest : GXmlTest {
});
Test.add_func ("/gxml/t-document/to_string", () => {
var doc = new TDocument ();
- var r = doc.create_element ("root");
- doc.children_nodes.add (r);
+ try {
+ var r = doc.create_element ("root");
+ doc.children_nodes.add (r);
#if DEBUG
- GLib.message (@"$(doc)");
+ GLib.message (@"$(doc)");
#endif
- string str = doc.to_string ();
- assert ("<?xml version=\"1.0\"?>" in str);
- assert ("<root/>" in str);
- assert ("<root/>" in doc.to_string ());
+ string str = doc.to_string ();
+ assert ("<?xml version=\"1.0\"?>" in str);
+ assert ("<root/>" in str);
+ assert ("<root/>" in doc.to_string ());
+ } catch (GLib.Error e) {
+ Test.message (e.message);
+ assert_not_reached ();
+ }
});
Test.add_func ("/gxml/t-document/namespace", () => {
try {
diff --git a/test/TElementTest.vala b/test/TElementTest.vala
index 26dac2f..f83ab91 100644
--- a/test/TElementTest.vala
+++ b/test/TElementTest.vala
@@ -591,23 +591,29 @@ class TElementTest : GXmlTest {
} catch { assert_not_reached (); }
});
Test.add_func ("/gxml/t-element/parent", () => {
- var doc = new TDocument ();
- var e = doc.create_element ("root");
- doc.children_nodes.add (e);
- var c = doc.create_element ("child");
- e.children_nodes.add (c);
- assert (e.children_nodes.size == 1);
- assert (e.children_nodes[0] != null);
- assert (e.children_nodes[0].name == "child");
- assert (c.parent != null);
- assert (doc.root != null);
- assert (doc.root.children_nodes[0] != null);
- assert (doc.root.children_nodes[0].name == "child");
- assert (doc.root.children_nodes[0].parent != null);
- assert (doc.root.children_nodes[0].parent.name == "root");
- assert (doc.root.parent == null);
+ try {
+ var doc = new TDocument ();
+ var e = doc.create_element ("root");
+ doc.children_nodes.add (e);
+ var c = doc.create_element ("child");
+ e.children_nodes.add (c);
+ assert (e.children_nodes.size == 1);
+ assert (e.children_nodes[0] != null);
+ assert (e.children_nodes[0].name == "child");
+ assert (c.parent != null);
+ assert (doc.root != null);
+ assert (doc.root.children_nodes[0] != null);
+ assert (doc.root.children_nodes[0].name == "child");
+ assert (doc.root.children_nodes[0].parent != null);
+ assert (doc.root.children_nodes[0].parent.name == "root");
+ assert (doc.root.parent == null);
+ } catch (GLib.Error e) {
+ GLib.message ("Error: "+e.message);
+ assert_not_reached ();
+ }
});
Test.add_func ("/gxml/t-element/attribute/parent", () => {
+ try {
var doc = new TDocument ();
var e = doc.create_element ("root");
doc.children_nodes.add (e);
@@ -618,6 +624,10 @@ class TElementTest : GXmlTest {
assert (doc.root.attrs["attr"] != null);
assert (doc.root.attrs["attr"].parent != null);
assert (doc.root.attrs["attr"].parent.name == "root");
+ } catch (GLib.Error e) {
+ GLib.message ("Error: "+e.message);
+ assert_not_reached ();
+ }
});
Test.add_func ("/gxml/t-element/readtype", () => {
try {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
