[gxml: 7/16] * GXmlDom -> GXml
- From: Richard Hans Schwarting <rschwart src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gxml: 7/16] * GXmlDom -> GXml
- Date: Fri, 27 Jul 2012 09:30:37 +0000 (UTC)
commit 863ac42c526311cd39edb4ea4f50ececaf3234b5
Author: Richard Schwarting <aquarichy gmail com>
Date: Fri Jul 27 11:08:02 2012 +0200
* GXmlDom -> GXml
configure.ac | 2 +-
gxml/Makefile.am | 2 +-
test/AttrTest.vala | 26 +++++++++++++-------------
test/CharacterDataTest.vala | 16 ++++++++--------
test/DocumentTest.vala | 30 +++++++++++++++---------------
test/ElementTest.vala | 42 +++++++++++++++++++++---------------------
test/GXmlTest.vala | 2 +-
test/NodeListTest.vala | 2 +-
test/TextTest.vala | 4 ++--
test/ValaLibxml2Test.vala | 2 +-
10 files changed, 64 insertions(+), 64 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 131fd30..8247b76 100644
--- a/configure.ac
+++ b/configure.ac
@@ -80,7 +80,7 @@ AM_CONDITIONAL(ENABLE_GI_SYSTEM_INSTALL, [test x"$enable_gi_system_install" = "x
AC_OUTPUT([
Makefile
-gxml/libgxmldom-0.2.pc
+gxml/libgxml.pc
gxml/Makefile
test/Makefile
po/Makefile.in])
diff --git a/gxml/Makefile.am b/gxml/Makefile.am
index 571d4d0..6ff329d 100644
--- a/gxml/Makefile.am
+++ b/gxml/Makefile.am
@@ -86,7 +86,7 @@ include_HEADERS = \
pkgconfigdir = $(libdir)/pkgconfig
-pkgconfig_DATA = libgxml-0.2.pc
+pkgconfig_DATA = libgxml.pc
gxmlincludedir=$(includedir)/libgxml-0.2
gxmlinclude_HEADERS= gxml.h
diff --git a/test/AttrTest.vala b/test/AttrTest.vala
index 9785ef4..e34f6bc 100644
--- a/test/AttrTest.vala
+++ b/test/AttrTest.vala
@@ -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 (GXmlDom.DomError e) {
+ } catch (GXml.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 (GXmlDom.DomError e) {
+ } catch (GXml.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 (GXmlDom.DomError e) {
+ } catch (GXml.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 (GXmlDom.DomError e) {
+ } catch (GXml.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 (GXmlDom.DomError e) {
+ } catch (GXml.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 (GXmlDom.DomError e) {
+ } catch (GXml.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 (GXmlDom.DomError e) {
+ } catch (GXml.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 (GXmlDom.DomError e) {
+ } catch (GXml.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 (GXmlDom.DomError e) {
+ } catch (GXml.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 (GXmlDom.DomError e) {
+ } catch (GXml.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 (GXmlDom.DomError e) {
+ } catch (GXml.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 (GXmlDom.DomError e) {
+ } catch (GXml.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 (GXmlDom.DomError e) {
+ } catch (GXml.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
diff --git a/test/CharacterDataTest.vala b/test/CharacterDataTest.vala
index 8b14994..1d87e3e 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 GXmlDom;
+using GXml;
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 (GXmlDom.DomError e) {
+ } catch (GXml.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 (GXmlDom.DomError e) {
+ } catch (GXml.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -34,7 +34,7 @@ class CharacterDataTest : GXmlTest {
assert (str == "trouble");
// TODO: test bounds
- } catch (GXmlDom.DomError e) {
+ } catch (GXml.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 (GXmlDom.DomError e) {
+ } catch (GXml.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 (GXmlDom.DomError e) {
+ } catch (GXml.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 (GXmlDom.DomError e) {
+ } catch (GXml.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 (GXmlDom.DomError e) {
+ } catch (GXml.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
diff --git a/test/DocumentTest.vala b/test/DocumentTest.vala
index 682e1af..bbb0956 100644
--- a/test/DocumentTest.vala
+++ b/test/DocumentTest.vala
@@ -1,5 +1,5 @@
/* -*- Mode: vala; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-using GXmlDom;
+using GXml;
class DocumentTest : GXmlTest {
public static void add_tests () {
@@ -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 (GXmlDom.DomError e) {
+ } catch (GXml.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -38,7 +38,7 @@ class DocumentTest : GXmlTest {
assert (root.node_name == "Sentences");
assert (root.has_child_nodes ());
- } catch (GXmlDom.DomError e) {
+ } catch (GXml.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -49,7 +49,7 @@ class DocumentTest : GXmlTest {
Document doc = get_doc ();
check_contents (doc);
- } catch (GXmlDom.DomError e) {
+ } catch (GXml.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -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 (GXmlDom.DomError e) {
+ } catch (GXml.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -144,7 +144,7 @@ class DocumentTest : GXmlTest {
*/
} catch (DomError.INVALID_CHARACTER e) {
}
- } catch (GXmlDom.DomError e) {
+ } catch (GXml.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 (GXmlDom.DomError e) {
+ } catch (GXml.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 (GXmlDom.DomError e) {
+ } catch (GXml.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 (GXmlDom.DomError e) {
+ } catch (GXml.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 (GXmlDom.DomError e) {
+ } catch (GXml.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 (GXmlDom.DomError e) {
+ } catch (GXml.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 (GXmlDom.DomError e) {
+ } catch (GXml.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 (GXmlDom.DomError e) {
+ } catch (GXml.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 (GXmlDom.DomError e) {
+ } catch (GXml.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 (GXmlDom.DomError e) {
+ } catch (GXml.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
diff --git a/test/ElementTest.vala b/test/ElementTest.vala
index b63d7ae..6d113fb 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 GXmlDom;
+using GXml;
-// namespace GXmlDom {
+// namespace GXml {
// 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 `GXmlDom.Element' not supported */
+// to `GXml.Element' not supported */
// base (node, doc);
// }
// }
@@ -43,7 +43,7 @@ class ElementTest : GXmlTest {
assert (node.prefix == "magic");
assert (node.local_name == "Potion");
assert (node.node_name == "Potion");
- } catch (GXmlDom.DomError e) {
+ } catch (GXml.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -56,7 +56,7 @@ class ElementTest : GXmlTest {
DomNode node = root.child_nodes.item (0);
assert (node.namespace_uri == "http://hogwarts.co.uk/magic");
- } catch (GXmlDom.DomError e) {
+ } catch (GXml.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 (GXmlDom.DomError e) {
+ } catch (GXml.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -91,7 +91,7 @@ class ElementTest : GXmlTest {
DomNode node = root.child_nodes.item (0);
assert (node.prefix == "magic");
- } catch (GXmlDom.DomError e) {
+ } catch (GXml.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -103,7 +103,7 @@ class ElementTest : GXmlTest {
DomNode node = root.child_nodes.item (0);
assert (node.local_name == "Potion");
- } catch (GXmlDom.DomError e) {
+ } catch (GXml.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 (GXmlDom.DomError e) {
+ } catch (GXml.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 (GXmlDom.DomError e) {
+ } catch (GXml.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -175,7 +175,7 @@ class ElementTest : GXmlTest {
* HashTable, and the document will have to re-sync
* before stringifying (or saving)*/
Test.add_func ("/gxml/element/syncing_of_dirty_elements", () => {
- HashTable<string,GXmlDom.Attr> attrs;
+ HashTable<string,GXml.Attr> attrs;
string str;
try {
@@ -186,7 +186,7 @@ class ElementTest : GXmlTest {
}
str = doc.to_string ();
- } catch (GXmlDom.DomError e) {
+ } catch (GXml.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -201,7 +201,7 @@ class ElementTest : GXmlTest {
assert ("Malfoy" == elem.get_attribute ("name"));
elem.set_attribute ("name", "Lovegood");
assert ("Lovegood" == elem.get_attribute ("name"));
- } catch (GXmlDom.DomError e) {
+ } catch (GXml.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -218,7 +218,7 @@ class ElementTest : GXmlTest {
assert (null == elem.get_attribute_node ("name"));
// Consider testing default attributes (see Attr and specified)
- } catch (GXmlDom.DomError e) {
+ } catch (GXml.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -230,7 +230,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 (GXmlDom.DomError e) {
+ } catch (GXml.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -251,7 +251,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 (GXmlDom.DomError e) {
+ } catch (GXml.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -273,7 +273,7 @@ class ElementTest : GXmlTest {
assert (elem.remove_attribute_node (attr) == attr);
assert (elem.get_attribute_node ("name") == null);
assert (elem.get_attribute ("name") == "");
- } catch (GXmlDom.DomError e) {
+ } catch (GXml.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -315,7 +315,7 @@ class ElementTest : GXmlTest {
assert (text.node_value == "gweasley hogwarts co uk");
// TODO: need to test that preorder traversal order is correct
- } catch (GXmlDom.DomError e) {
+ } catch (GXml.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -424,7 +424,7 @@ class ElementTest : GXmlTest {
// Test restoring subtree
bs.append_child (b4);
assert (ts.length == 11);
- } catch (GXmlDom.DomError e) {
+ } catch (GXml.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -435,7 +435,7 @@ class ElementTest : GXmlTest {
elem.normalize ();
// STUB
- } catch (GXmlDom.DomError e) {
+ } catch (GXml.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
@@ -457,7 +457,7 @@ class ElementTest : GXmlTest {
}
// TODO: want to test with format on and off
- } catch (GXmlDom.DomError e) {
+ } catch (GXml.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
diff --git a/test/GXmlTest.vala b/test/GXmlTest.vala
index 74ceb1a..2da94af 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 GXmlDom;
+using GXml;
class GXmlTest {
public static int main (string[] args) {
diff --git a/test/NodeListTest.vala b/test/NodeListTest.vala
index bee5903..b182a1a 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 GXmlDom;
+using GXml;
class NodeListTest : GXmlTest {
public static void add_tests () {
diff --git a/test/TextTest.vala b/test/TextTest.vala
index 0bf560b..cfee7a2 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 GXmlDom;
+using GXml;
class TextTest : GXmlTest {
public static void add_tests () {
@@ -46,7 +46,7 @@ class TextTest : GXmlTest {
assert (txt2.node_value == "Const");
- } catch (GXmlDom.DomError e) {
+ } catch (GXml.DomError e) {
GLib.warning ("%s", e.message);
assert (false);
}
diff --git a/test/ValaLibxml2Test.vala b/test/ValaLibxml2Test.vala
index a0081d6..f6f503d 100644
--- a/test/ValaLibxml2Test.vala
+++ b/test/ValaLibxml2Test.vala
@@ -1,5 +1,5 @@
/* -*- Mode: vala; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-using GXmlDom;
+using GXml;
class ValaLibxml2Test : GXmlTest {
public static void add_tests () {
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]