[gxml] * update test cases to use GXmlDom namespace; add ValaLibxml2Test, testing our bindings
- From: Richard Hans Schwarting <rschwart src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gxml] * update test cases to use GXmlDom namespace; add ValaLibxml2Test, testing our bindings
- Date: Thu, 14 Jun 2012 22:14:36 +0000 (UTC)
commit 939f7338ad53a3d92a5e21392a83a0d25194ed25
Author: Richard Schwarting <aquarichy gmail com>
Date: Sun Jun 3 04:40:31 2012 -0400
* update test cases to use GXmlDom namespace; add ValaLibxml2Test, testing our bindings
test/AttrTest.vala | 28 +++++++++++++-------------
test/CharacterDataTest.vala | 16 +++++++-------
test/DocumentTest.vala | 44 +++++++++++++++++++++---------------------
test/ElementTest.vala | 44 +++++++++++++++++++++---------------------
test/GXmlTest.vala | 5 ++-
test/NodeListTest.vala | 2 +-
test/TextTest.vala | 4 +-
test/ValaLibxml2Test.vala | 40 +++++++++++++++++++++++++++++++++++++++
test/XNodeTest.vala | 34 ++++++++++++++++----------------
9 files changed, 129 insertions(+), 88 deletions(-)
---
diff --git a/test/AttrTest.vala b/test/AttrTest.vala
index f67e886..1128e09 100644
--- a/test/AttrTest.vala
+++ b/test/AttrTest.vala
@@ -1,5 +1,5 @@
/* -*- Mode: vala; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-using GXml.Dom;
+using GXmlDom;
class AttrTest : GXmlTest {
public static void add_tests () {
@@ -16,7 +16,7 @@ class AttrTest : GXmlTest {
assert (core.namespace_uri == "http://mom.co.uk/wands";);
assert (shell.namespace_uri == "http://mom.co.uk/wands";);
assert (price.namespace_uri == null);
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -34,7 +34,7 @@ class AttrTest : GXmlTest {
assert (core.prefix == "wands");
assert (shell.prefix == "wands");
assert (price.prefix == null);
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -52,7 +52,7 @@ class AttrTest : GXmlTest {
assert (core.local_name == "core");
assert (shell.local_name == "shell");
assert (price.local_name == "price");
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -64,7 +64,7 @@ class AttrTest : GXmlTest {
Attr attr = get_attr ("broomSeries", "Nimbus", doc);
assert (attr.node_name == "broomSeries");
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -82,7 +82,7 @@ class AttrTest : GXmlTest {
/* make sure changing .value changes .node_value */
attr.value = "Gringots";
assert (attr.node_value == "Gringots");
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -93,7 +93,7 @@ class AttrTest : GXmlTest {
Attr attr = get_attr ("broomSeries", "Nimbus", doc);
assert (attr.name == "broomSeries");
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -111,7 +111,7 @@ class AttrTest : GXmlTest {
/* make sure changing .node_value changes .value */
attr.node_value = "Gringots";
assert (attr.value == "Gringots");
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -128,7 +128,7 @@ class AttrTest : GXmlTest {
assert (attr.parent_node == null);
elem.set_attribute_node (attr);
assert (attr.parent_node == null);
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -145,7 +145,7 @@ class AttrTest : GXmlTest {
assert (attr1.previous_sibling == null);
assert (attr2.previous_sibling == null);
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -162,7 +162,7 @@ class AttrTest : GXmlTest {
assert (attr1.next_sibling == null);
assert (attr2.next_sibling == null);
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -178,7 +178,7 @@ class AttrTest : GXmlTest {
assert (attr.value == "Whipped Dumbleberry");
// the Text nodes should be merged
assert (attr.child_nodes.length == 1);
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -192,7 +192,7 @@ class AttrTest : GXmlTest {
assert (attr.value == "Slytherin");
attr.replace_child (txt, attr.child_nodes.item (0));
assert (attr.value == "Gryffindor");
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -206,7 +206,7 @@ class AttrTest : GXmlTest {
// mischief managed
attr.remove_child (attr.child_nodes.last ());
assert (attr.value == "");
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
diff --git a/test/CharacterDataTest.vala b/test/CharacterDataTest.vala
index c2ba5dd..8b14994 100644
--- a/test/CharacterDataTest.vala
+++ b/test/CharacterDataTest.vala
@@ -1,5 +1,5 @@
/* -*- Mode: vala; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-using GXml.Dom;
+using GXmlDom;
class CharacterDataTest : GXmlTest {
public static void add_tests () {
@@ -10,7 +10,7 @@ class CharacterDataTest : GXmlTest {
assert (txt.data == str);
assert (txt.data == txt.node_value);
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -21,7 +21,7 @@ class CharacterDataTest : GXmlTest {
Text txt = get_text_new_doc (str);
assert (txt.length == str.length);
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -34,7 +34,7 @@ class CharacterDataTest : GXmlTest {
assert (str == "trouble");
// TODO: test bounds
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -48,7 +48,7 @@ class CharacterDataTest : GXmlTest {
assert (txt.data == str_start);
txt.append_data (" if you can't see where it keeps its brain.");
assert (txt.data == str_whole);
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -59,7 +59,7 @@ class CharacterDataTest : GXmlTest {
txt.insert_data (35, " truly");
assert (txt.data == "It is our choices that show what we truly are, far more than our abilities.");
// TODO: test bounds
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -70,7 +70,7 @@ class CharacterDataTest : GXmlTest {
txt.delete_data (14, 65);
assert (txt.data == "Happiness can turn on the light.");
// TODO: test bounds
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -82,7 +82,7 @@ class CharacterDataTest : GXmlTest {
Text txt = get_text_new_doc ("In dreams, we enter a world that's entirely our own.");
txt.replace_data (3, 6, "the refrigerator");
assert (txt.data == "In the refrigerator, we enter a world that's entirely our own.");
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
diff --git a/test/DocumentTest.vala b/test/DocumentTest.vala
index 299039c..608f7e4 100644
--- a/test/DocumentTest.vala
+++ b/test/DocumentTest.vala
@@ -1,12 +1,12 @@
/* -*- Mode: vala; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-using GXml.Dom;
+using GXmlDom;
class DocumentTest : GXmlTest {
public static void add_tests () {
Test.add_func ("/gxml/document/doctype", () => {
// STUB
/*
- Document doc = new Document.for_path ("/tmp/dtdtest2.xml");
+ Document doc = new Document.from_path ("/tmp/dtdtest2.xml");
// Document doc = get_doc ();
DocumentType type = doc.doctype;
HashTable<string,Entity> entities = type.entities;
@@ -26,7 +26,7 @@ class DocumentTest : GXmlTest {
assert (impl.has_feature ("xml", "2.0") == false);
assert (impl.has_feature ("html") == false);
assert (impl.has_feature ("nonsense") == false);
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -38,29 +38,29 @@ class DocumentTest : GXmlTest {
assert (root.node_name == "Sentences");
assert (root.has_child_nodes ());
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
});
- Test.add_func ("/gxml/document/construct_for_path", () => {
+ Test.add_func ("/gxml/document/construct_from_path", () => {
try {
Document doc = get_doc ();
check_contents (doc);
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
});
- Test.add_func ("/gxml/document/construct_for_stream", () => {
+ Test.add_func ("/gxml/document/construct_from_stream", () => {
try {
File fin = File.new_for_path ("test.xml");
InputStream instream = fin.read (null);
// TODO use cancellable
- Document doc = new Document.for_stream (instream);
+ Document doc = new Document.from_stream (instream);
check_contents (doc);
} catch (GLib.Error e) {
@@ -78,7 +78,7 @@ class DocumentTest : GXmlTest {
assert (root.has_child_nodes () == true);
assert (root.first_child.node_name == "Apple");
assert (root.last_child.node_name == "Orange");
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -105,7 +105,7 @@ class DocumentTest : GXmlTest {
// OutputStream outstream = fout.create (FileCreateFlags.REPLACE_DESTINATION, null); // REPLACE_DESTINATION doesn't work like I thought it would?
OutputStream outstream = fout.replace (null, true, FileCreateFlags.REPLACE_DESTINATION, null);
- Document doc = new Document.for_stream (instream);
+ Document doc = new Document.from_stream (instream);
int exit_status;
doc.save_to_stream (outstream);
@@ -144,7 +144,7 @@ class DocumentTest : GXmlTest {
*/
} catch (DomError.INVALID_CHARACTER e) {
}
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -217,7 +217,7 @@ class DocumentTest : GXmlTest {
";
// TODO: want to find a way to flattern the string, strip whitespace
assert (doc.to_string () == expected);
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -229,7 +229,7 @@ class DocumentTest : GXmlTest {
assert (text.node_name == "#text");
assert (text.node_value == "Star of my dreams");
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -241,7 +241,7 @@ class DocumentTest : GXmlTest {
assert (comment.node_name == "#comment");
assert (comment.node_value == "Ever since the day we promised.");
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -253,7 +253,7 @@ class DocumentTest : GXmlTest {
assert (cdata.node_name == "#cdata-section");
assert (cdata.node_value == "put in real cdata");
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -267,7 +267,7 @@ class DocumentTest : GXmlTest {
assert (instruction.target == "target");
assert (instruction.data == "data");
assert (instruction.node_value == "data");
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -280,7 +280,7 @@ class DocumentTest : GXmlTest {
assert (attr.name == "attrname");
assert (attr.node_name == "attrname");
assert (attr.node_value == "");
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -292,7 +292,7 @@ class DocumentTest : GXmlTest {
assert (entity.node_name == "entref");
// TODO: think of at least one other smoke test
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -306,7 +306,7 @@ class DocumentTest : GXmlTest {
assert (((Element)elems.item (0)).content == "fweasley hogwarts co uk");
/* more thorough test exists in Element, since right now
Document uses that one */
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -331,7 +331,7 @@ class DocumentTest : GXmlTest {
</Sentences>
");
// TODO: want to test with format on and off
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -367,7 +367,7 @@ class DocumentTest : GXmlTest {
}
public static void print_node (XNode node) {
- List<GXml.Dom.XNode> children = (List<GXml.Dom.XNode>)node.child_nodes;
+ List<GXmlDom.XNode> children = (List<GXmlDom.XNode>)node.child_nodes;
if (node.node_type != 3)
GLib.stdout.printf ("<%s", node.node_name);
@@ -380,7 +380,7 @@ class DocumentTest : GXmlTest {
GLib.stdout.printf (">");
if (node.node_value != null)
GLib.stdout.printf ("%s", node.node_value);
- foreach (GXml.Dom.XNode child in children) {
+ foreach (GXmlDom.XNode child in children) {
// TODO: want a stringification method for Nodes?
print_node (child);
}
diff --git a/test/ElementTest.vala b/test/ElementTest.vala
index dfba309..e856bfc 100644
--- a/test/ElementTest.vala
+++ b/test/ElementTest.vala
@@ -1,11 +1,11 @@
/* -*- Mode: vala; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-using GXml.Dom;
+using GXmlDom;
-// namespace GXml.Dom {
+// namespace GXmlDom {
// public class TestElement : Element {
// public TestElement (Xml.Node *node, Document doc) {
// /* /home2/richard/gxml/test/ElementTest.vala:7.4-7.19: error: chain up
-// to `GXml.Dom.Element' not supported */
+// to `GXmlDom.Element' not supported */
// base (node, doc);
// }
// }
@@ -32,7 +32,7 @@ class ElementTest : GXmlTest {
xmlnode->new_ns_prop (ns_course, "commonName", "Florax");
xmlroot->add_child (xmlnode);
- Document doc = new Document.for_libxml2 (xmldoc);
+ Document doc = new Document.from_libxml2 (xmldoc);
XNode root = doc.document_element;
XNode node = root.child_nodes.item (0);
@@ -43,7 +43,7 @@ class ElementTest : GXmlTest {
assert (node.prefix == "magic");
assert (node.local_name == "Potion");
assert (node.node_name == "Potion");
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -56,7 +56,7 @@ class ElementTest : GXmlTest {
XNode node = root.child_nodes.item (0);
assert (node.namespace_uri == "http://hogwarts.co.uk/magic";);
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -79,7 +79,7 @@ class ElementTest : GXmlTest {
// foreach (Attr attr in node.attributes.get_values ()) {
// message ("attrkey: %s, value: %s", attr.node_name, attr.node_value);
// }
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -91,7 +91,7 @@ class ElementTest : GXmlTest {
XNode node = root.child_nodes.item (0);
assert (node.prefix == "magic");
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -103,7 +103,7 @@ class ElementTest : GXmlTest {
XNode node = root.child_nodes.item (0);
assert (node.local_name == "Potion");
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -125,7 +125,7 @@ class ElementTest : GXmlTest {
assert (namespaces.item (1).node_name == "products");
assert (namespaces.item (1).node_value == "http://diagonalley.co.uk/products";);
assert (node.local_name == "Potion");
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -164,7 +164,7 @@ class ElementTest : GXmlTest {
attributes.remove ("alley");
assert (elem.get_attribute ("alley") == "");
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -179,11 +179,11 @@ class ElementTest : GXmlTest {
Document doc = new Document.from_string ("<?xml version='1.0' encoding='UTF-8'?><entry><link rel='http://schemas.google.com/contacts/2008/rel#photo'/></entry>");
XNode root = doc.document_element;
foreach (XNode child in root.child_nodes) {
- HashTable<string,GXml.Dom.Attr> attrs = child.attributes;
+ HashTable<string,GXmlDom.Attr> attrs = child.attributes;
}
string str = doc.to_string ();
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -198,7 +198,7 @@ class ElementTest : GXmlTest {
assert ("Malfoy" == elem.get_attribute ("name"));
elem.set_attribute ("name", "Lovegood");
assert ("Lovegood" == elem.get_attribute ("name"));
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -215,7 +215,7 @@ class ElementTest : GXmlTest {
assert (null == elem.get_attribute_node ("name"));
// Consider testing default attributes (see Attr and specified)
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -227,7 +227,7 @@ class ElementTest : GXmlTest {
assert (elem.get_attribute_node ("name") == null);
elem.set_attribute ("name", "Severus");
assert (elem.get_attribute_node ("name").value == "Severus");
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -248,7 +248,7 @@ class ElementTest : GXmlTest {
assert (elem.get_attribute_node ("name").value == "Snape");
assert (elem.set_attribute_node (attr2).value == "Snape");
assert (elem.get_attribute_node ("name").value == "Moody");
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -270,7 +270,7 @@ class ElementTest : GXmlTest {
assert (elem.remove_attribute_node (attr) == attr);
assert (elem.get_attribute_node ("name") == null);
assert (elem.get_attribute ("name") == "");
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -312,7 +312,7 @@ class ElementTest : GXmlTest {
assert (text.node_value == "gweasley hogwarts co uk");
// TODO: need to test that preorder traversal order is correct
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -421,7 +421,7 @@ class ElementTest : GXmlTest {
// Test restoring subtree
bs.append_child (b4);
assert (ts.length == 11);
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -432,7 +432,7 @@ class ElementTest : GXmlTest {
elem.normalize ();
// STUB
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -449,7 +449,7 @@ class ElementTest : GXmlTest {
assert (elem2.to_string () == "<messy>&lt;<>&gt;</messy>");
// TODO: want to test with format on and off
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
diff --git a/test/GXmlTest.vala b/test/GXmlTest.vala
index 8f59bd3..44c450e 100644
--- a/test/GXmlTest.vala
+++ b/test/GXmlTest.vala
@@ -1,5 +1,5 @@
/* -*- Mode: vala; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-using GXml.Dom;
+using GXmlDom;
class GXmlTest {
public static int main (string[] args) {
@@ -11,6 +11,7 @@ class GXmlTest {
NodeListTest.add_tests ();
TextTest.add_tests ();
CharacterDataTest.add_tests ();
+ ValaLibxml2Test.add_tests ();
Test.run ();
return 1;
@@ -19,7 +20,7 @@ class GXmlTest {
internal static Document get_doc () throws DomError {
Document doc = null;
try {
- doc = new Document.for_path ("test.xml");
+ doc = new Document.from_path ("test.xml");
} catch (DomError e) {
}
return doc;
diff --git a/test/NodeListTest.vala b/test/NodeListTest.vala
index ac92868..bee5903 100644
--- a/test/NodeListTest.vala
+++ b/test/NodeListTest.vala
@@ -1,5 +1,5 @@
/* -*- Mode: vala; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-using GXml.Dom;
+using GXmlDom;
class NodeListTest : GXmlTest {
public static void add_tests () {
diff --git a/test/TextTest.vala b/test/TextTest.vala
index fb548f0..6077b1b 100644
--- a/test/TextTest.vala
+++ b/test/TextTest.vala
@@ -1,5 +1,5 @@
/* -*- Mode: vala; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-using GXml.Dom;
+using GXmlDom;
class TextTest : GXmlTest {
public static void add_tests () {
@@ -46,7 +46,7 @@ class TextTest : GXmlTest {
assert (txt2.node_value == "Const");
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
diff --git a/test/ValaLibxml2Test.vala b/test/ValaLibxml2Test.vala
new file mode 100644
index 0000000..cba6b1a
--- /dev/null
+++ b/test/ValaLibxml2Test.vala
@@ -0,0 +1,40 @@
+/* -*- Mode: vala; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+using GXmlDom;
+
+class ValaLibxml2Test : GXmlTest {
+ public static void add_tests () {
+ Test.add_func ("/gxml/vala_libxml2/xmlHashTable", () => {
+ try {
+ Xml.HashTable *table = new Xml.HashTable (10);
+ assert (table->size () == 0);
+ table->add_entry ("maple", "syrup");
+ assert (table->size () == 1);
+
+ // new one should return 0, increase size
+ assert (table->add_entry ("swiss", "cheese") == 0);
+ assert (table->size () == 2);
+
+ // duplicate should fail
+ assert (table->add_entry ("swiss", "cheese") == -1);
+ assert (table->size () == 2);
+
+ // remove one, size should decrease
+ assert (table->remove_entry ("maple", null) == 0);
+ assert (table->size () == 1);
+
+ // try removing it again, it shouldn't exist, should fail
+ assert (table->remove_entry ("maple", null) == -1);
+ assert (table->size () == 1);
+
+ assert (table->lookup ("swiss") == "cheese");
+
+ table->free (/* should pass it a string deallocator */ null);
+ /* deallocator: takes (void *payload, string name), just frees payload */
+ // TODO: figure out a way to test whether table was freed
+ } catch (Error e) {
+ GLib.warning ("%s", e.message);
+ assert (false);
+ }
+ });
+ }
+}
\ No newline at end of file
diff --git a/test/XNodeTest.vala b/test/XNodeTest.vala
index f4004f3..c9ecea4 100644
--- a/test/XNodeTest.vala
+++ b/test/XNodeTest.vala
@@ -1,5 +1,5 @@
/* -*- Mode: vala; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-using GXml.Dom;
+using GXmlDom;
/* For testing, based on:
https://live.gnome.org/Vala/TestSample
@@ -51,7 +51,7 @@ class XNodeTest : GXmlTest {
// node = doc.create_notation ("some notation");
// assert (node.node_name == ...); // notation name
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -98,7 +98,7 @@ class XNodeTest : GXmlTest {
// node = doc.create_notation ("some notation");
// assert (node.node_type == NodeType.NOTATION);
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -145,7 +145,7 @@ class XNodeTest : GXmlTest {
as a XNode.
XNode wants to get it from XNode's Xml.Node* node,
while Attr wants to get it from Attr's Xml.Attr* node. :( */
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -164,7 +164,7 @@ class XNodeTest : GXmlTest {
assert (attr.parent_node == null);
assert (doc.parent_node == null);
// assert (document fragment's parent_node == null); // TODO
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -184,7 +184,7 @@ class XNodeTest : GXmlTest {
assert (parent.child_nodes.length == 3);
assert (parent.child_nodes.nth_data (0) == child_0);
assert (parent.child_nodes.nth_data (2) == child_2);
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -203,7 +203,7 @@ class XNodeTest : GXmlTest {
parent.append_child (child_2);
assert (parent.first_child == child_0);
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -222,7 +222,7 @@ class XNodeTest : GXmlTest {
parent.append_child (child_2);
assert (parent.last_child == child_2);
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -243,7 +243,7 @@ class XNodeTest : GXmlTest {
assert (child_0.previous_sibling == null);
assert (child_1.previous_sibling == child_0);
assert (child_2.previous_sibling == child_1);
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -264,7 +264,7 @@ class XNodeTest : GXmlTest {
assert (child_0.next_sibling == child_1);
assert (child_1.next_sibling == child_2);
assert (child_2.next_sibling == null);
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -280,7 +280,7 @@ class XNodeTest : GXmlTest {
// TODO: test more
// TODO: test compatibility between live changes and stuff
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -293,7 +293,7 @@ class XNodeTest : GXmlTest {
assert (elem.owner_document == doc1);
assert (elem.owner_document != doc2);
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -323,7 +323,7 @@ class XNodeTest : GXmlTest {
assert (child_0.next_sibling == child_1);
assert (child_1.next_sibling == child_2);
assert (child_2.next_sibling == null);
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -353,7 +353,7 @@ class XNodeTest : GXmlTest {
assert (child_1.previous_sibling == child_0);
assert (child_0.next_sibling == child_1);
assert (child_1.next_sibling == null);
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -400,7 +400,7 @@ class XNodeTest : GXmlTest {
assert (parent.first_child == null);
assert (parent.last_child == null);
assert (parent.child_nodes.length == 0);
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -430,7 +430,7 @@ class XNodeTest : GXmlTest {
assert (child_0.next_sibling == child_1);
assert (child_1.next_sibling == child_2);
assert (child_2.next_sibling == null);
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -446,7 +446,7 @@ class XNodeTest : GXmlTest {
parent.append_child (child_0);
assert (parent.has_child_nodes () == true);
- } catch (GXml.Dom.DomError e) {
+ } catch (GXmlDom.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
