[gxml: 18/18] test/{Text, GXml, Element, CharacterData}Test.vala: because owner_document is a weak reference now, we
- From: Richard Hans Schwarting <rschwart src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gxml: 18/18] test/{Text, GXml, Element, CharacterData}Test.vala: because owner_document is a weak reference now, we
- Date: Tue, 18 Jun 2013 18:15:28 +0000 (UTC)
commit 88b4db9937b9efb1673eb83ba13b104d61754239
Author: Richard Schwarting <aquarichy gmail com>
Date: Mon Jun 10 00:17:50 2013 -0400
test/{Text,GXml,Element,CharacterData}Test.vala: because owner_document is a weak reference now, we can't
simply create nodes and drop the Document anymore
test/CharacterDataTest.vala | 21 ++++++++++++++-------
test/ElementTest.vala | 23 +++++++++++++++--------
test/GXmlTest.vala | 8 ++++----
test/TextTest.vala | 3 ++-
4 files changed, 35 insertions(+), 20 deletions(-)
---
diff --git a/test/CharacterDataTest.vala b/test/CharacterDataTest.vala
index 6936c3f..6a54a52 100644
--- a/test/CharacterDataTest.vala
+++ b/test/CharacterDataTest.vala
@@ -6,7 +6,8 @@ class CharacterDataTest : GXmlTest {
Test.add_func ("/gxml/characterdata/data", () => {
try {
string str = "It does not do to dwell on dreams and forget to live,
remember that.";
- Text txt = get_text_new_doc (str);
+ Document doc;
+ Text txt = get_text_new_doc (str, out doc);
assert (txt.data == str);
assert (txt.data == txt.node_value);
@@ -18,7 +19,8 @@ class CharacterDataTest : GXmlTest {
Test.add_func ("/gxml/characterdata/length", () => {
try {
string str = "After all, to the well-organized mind, death is but the
next great adventure.";
- Text txt = get_text_new_doc (str);
+ Document doc;
+ Text txt = get_text_new_doc (str, out doc);
assert (txt.length == str.length);
} catch (GXml.DomError e) {
@@ -28,7 +30,8 @@ class CharacterDataTest : GXmlTest {
});
Test.add_func ("/gxml/characterdata/substring_data", () => {
try {
- Text txt = get_text_new_doc ("The trouble is, humans do have a knack
of choosing precisely those things that are worst for them.");
+ Document doc;
+ Text txt = get_text_new_doc ("The trouble is, humans do have a knack
of choosing precisely those things that are worst for them.", out doc);
string str = txt.substring_data (4, 7);
assert (str == "trouble");
@@ -43,7 +46,8 @@ class CharacterDataTest : GXmlTest {
try {
string str_start = "Never trust anything that can think for itself";
string str_whole = "Never trust anything that can think for itself if
you can't see where it keeps its brain.";
- Text txt = get_text_new_doc ("Never trust anything that can think for
itself");
+ Document doc;
+ Text txt = get_text_new_doc ("Never trust anything that can think for
itself", out doc);
assert (txt.data == str_start);
txt.append_data (" if you can't see where it keeps its brain.");
@@ -55,7 +59,8 @@ class CharacterDataTest : GXmlTest {
});
Test.add_func ("/gxml/characterdata/insert_data", () => {
try {
- Text txt = get_text_new_doc ("It is our choices that show what we
are, far more than our abilities.");
+ Document doc;
+ Text txt = get_text_new_doc ("It is our choices that show what we
are, far more than our abilities.", out doc);
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
@@ -66,7 +71,8 @@ class CharacterDataTest : GXmlTest {
});
Test.add_func ("/gxml/characterdata/delete_data", () => {
try {
- Text txt = get_text_new_doc ("Happiness can be found, even in the
darkest of times, if one only remembers to turn on the light.");
+ Document doc;
+ Text txt = get_text_new_doc ("Happiness can be found, even in the
darkest of times, if one only remembers to turn on the light.", out doc);
txt.delete_data (14, 65);
assert (txt.data == "Happiness can turn on the light.");
// TODO: test bounds
@@ -79,7 +85,8 @@ class CharacterDataTest : GXmlTest {
try {
// TODO: test bounds
- Text txt = get_text_new_doc ("In dreams, we enter a world that's
entirely our own.");
+ Document doc;
+ Text txt = get_text_new_doc ("In dreams, we enter a world that's
entirely our own.", out doc);
txt.replace_data (3, 6, "the refrigerator");
assert (txt.data == "In the refrigerator, we enter a world that's
entirely our own.");
} catch (GXml.DomError e) {
diff --git a/test/ElementTest.vala b/test/ElementTest.vala
index 9ba9d50..4b9bec7 100644
--- a/test/ElementTest.vala
+++ b/test/ElementTest.vala
@@ -193,7 +193,8 @@ class ElementTest : GXmlTest {
});
Test.add_func ("/gxml/element/get_set_attribute", () => {
try {
- Element elem = get_elem_new_doc ("student");
+ Document doc;
+ Element elem = get_elem_new_doc ("student", out doc);
assert ("" == elem.get_attribute ("name"));
@@ -208,7 +209,8 @@ class ElementTest : GXmlTest {
});
Test.add_func ("/gxml/element/remove_attribute", () => {
try {
- Element elem = get_elem_new_doc ("tagname");
+ Document doc;
+ Element elem = get_elem_new_doc ("tagname", out doc);
elem.set_attribute ("name", "Malfoy");
assert ("Malfoy" == elem.get_attribute ("name"));
@@ -225,7 +227,8 @@ class ElementTest : GXmlTest {
});
Test.add_func ("/gxml/element/get_attribute_node", () => {
try {
- Element elem = get_elem_new_doc ("tagname");
+ Document doc;
+ Element elem = get_elem_new_doc ("tagname", out doc);
assert (elem.get_attribute_node ("name") == null);
elem.set_attribute ("name", "Severus");
@@ -237,7 +240,8 @@ class ElementTest : GXmlTest {
});
Test.add_func ("/gxml/element/set_attribute_node", () => {
try {
- Element elem = get_elem_new_doc ("tagname");
+ Document doc;
+ Element elem = get_elem_new_doc ("tagname", out doc);
Attr attr1 = elem.owner_document.create_attribute ("name");
Attr attr2 = elem.owner_document.create_attribute ("name");
@@ -260,7 +264,8 @@ class ElementTest : GXmlTest {
Test.add_func ("/gxml/element/remove_attribute_node", () => {
try {
- Element elem = get_elem_new_doc ("tagname");
+ Document doc;
+ Element elem = get_elem_new_doc ("tagname", out doc);
Attr attr;
attr = elem.owner_document.create_attribute ("name");
@@ -431,7 +436,8 @@ class ElementTest : GXmlTest {
});
Test.add_func ("/gxml/element/normalize", () => {
try {
- Element elem = get_elem_new_doc ("tagname");
+ Document doc;
+ Element elem = get_elem_new_doc ("tagname", out doc);
elem.normalize ();
// STUB
@@ -442,12 +448,13 @@ class ElementTest : GXmlTest {
});
Test.add_func ("/gxml/element/to_string", () => {
try {
- Element elem = get_elem_new_doc ("country");
+ Document doc, doc2;
+ Element elem = get_elem_new_doc ("country", out doc);
elem.append_child (elem.owner_document.create_text_node ("New
Zealand"));
assert (elem.to_string () == "<country>New Zealand</country>");
// during stringification, we don't want to confuse XML <> with text
<>
- Element elem2 = get_elem_new_doc ("messy");
+ Element elem2 = get_elem_new_doc ("messy", out doc2);
elem2.append_child (elem.owner_document.create_text_node
("<<>>"));
string expected = "<messy>&lt;<>&gt;</messy>";
if (elem2.to_string () != expected) {
diff --git a/test/GXmlTest.vala b/test/GXmlTest.vala
index 7b0440f..035bf31 100644
--- a/test/GXmlTest.vala
+++ b/test/GXmlTest.vala
@@ -47,8 +47,8 @@ class GXmlTest {
return attr;
}
- internal static Element get_elem_new_doc (string name) throws DomError {
- return get_elem (name, get_doc ());
+ internal static Element get_elem_new_doc (string name, out Document doc) throws DomError {
+ return get_elem (name, doc = get_doc ());
}
internal static Element get_elem (string name, Document doc) throws DomError {
@@ -56,8 +56,8 @@ class GXmlTest {
return elem;
}
- internal static Text get_text_new_doc (string data) throws DomError {
- return get_text (data, get_doc ());
+ internal static Text get_text_new_doc (string data, out Document doc) throws DomError {
+ return get_text (data, doc = get_doc ());
}
internal static Text get_text (string data, Document doc) {
diff --git a/test/TextTest.vala b/test/TextTest.vala
index 79a2ab5..fd58668 100644
--- a/test/TextTest.vala
+++ b/test/TextTest.vala
@@ -7,7 +7,8 @@ class TextTest : GXmlTest {
Test.add_func ("/gxml/text/split_text", () => {
try {
- Text txt1 = get_text_new_doc ("Constant vigilance!");
+ Document doc;
+ Text txt1 = get_text_new_doc ("Constant vigilance!", out doc);
Text txt2 = txt1.split_text (5);
assert (txt1.node_value == "Const");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
