[gxml] Renamed old GXml.Document to new GXml.xDocument
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gxml] Renamed old GXml.Document to new GXml.xDocument
- Date: Tue, 14 Apr 2015 19:07:44 +0000 (UTC)
commit 8270f0a714da69e51725c1b043bf13b54d3bbfd8
Author: Daniel Espinosa <esodan gmail com>
Date: Tue Apr 14 14:00:46 2015 -0500
Renamed old GXml.Document to new GXml.xDocument
* This is a step required to avoid conflicts with new
interface API GXml.Document
gxml/SerializableJson.vala | 14 ++--
gxml/SerializableObjectModel.vala | 14 ++--
gxml/Serialization.vala | 32 +++++-----
gxml/libxml-Attr.vala | 6 +-
gxml/libxml-BackedNode.vala | 4 +-
gxml/libxml-CDATASection.vala | 6 +-
gxml/libxml-CharacterData.vala | 4 +-
gxml/libxml-Comment.vala | 8 +-
gxml/libxml-Document.vala | 90 +++++++++++++++---------------
gxml/libxml-DocumentFragment.vala | 11 ++--
gxml/libxml-DocumentType.vala | 4 +-
gxml/libxml-Element.vala | 12 ++--
gxml/libxml-Entity.vala | 2 +-
gxml/libxml-EntityReference.vala | 4 +-
gxml/libxml-Implementation.vala | 16 +++---
gxml/libxml-NamespaceAttr.vala | 4 +-
gxml/libxml-Node.vala | 50 ++++++++--------
gxml/libxml-NodeList.vala | 18 +++---
gxml/libxml-Notation.vala | 4 +-
gxml/libxml-ProcessingInstruction.vala | 4 +-
gxml/libxml-Text.vala | 6 +-
test/AttrTest.vala | 26 ++++----
test/CharacterDataTest.vala | 37 ++++++++++--
test/DocumentTest.vala | 64 +++++++++++-----------
test/ElementTest.vala | 44 +++++++-------
test/EnumerationTest.vala | 24 ++++----
test/GXmlTest.vala | 40 ++++++++++---
test/NamespaceTest.vala | 23 +++++++-
test/NodeTest.vala | 38 ++++++------
test/SerializableBasicTypesTest.vala | 52 +++++++++---------
test/SerializableGeeArrayListTest.vala | 8 +-
test/SerializableGeeCollectionsTest.vala | 10 ++--
test/SerializableGeeDualKeyMapTest.vala | 8 +-
test/SerializableGeeHashMapTest.vala | 12 ++--
test/SerializableGeeTreeMapTest.vala | 8 +-
test/SerializableObjectModelTest.vala | 68 +++++++++++++----------
test/SerializableTest.vala | 19 ++++--
test/SerializationTest.vala | 36 ++++++------
test/TextTest.vala | 26 ++++++++-
test/gxml-performance.vala | 8 +-
40 files changed, 483 insertions(+), 381 deletions(-)
---
diff --git a/gxml/SerializableJson.vala b/gxml/SerializableJson.vala
index bc5d473..802ccab 100644
--- a/gxml/SerializableJson.vala
+++ b/gxml/SerializableJson.vala
@@ -109,22 +109,22 @@ public class GXml.SerializableJson : GLib.Object, GXml.Serializable
return false;
}
/**
- * If @node is a Document serialize just add an <Object> element.
+ * If @node is a xDocument serialize just add an <Object> element.
*
* If @node is an Element serialize add to it an <Object> element.
*
- * Is up to you to add convenient Element node to a Document, in order to be
+ * Is up to you to add convenient Element node to a xDocument, in order to be
* used by serialize and add new <Object> tags per object to serialize.
*/
public GXml.xNode? serialize (GXml.xNode node) throws GLib.Error
{
- Document doc;
+ xDocument doc;
Element root;
ParamSpec[] props;
string oid = "%p".printf(this);
- if (node is Document)
- doc = (Document) node;
+ if (node is xDocument)
+ doc = (xDocument) node;
else
doc = node.owner_document;
@@ -197,7 +197,7 @@ public class GXml.SerializableJson : GLib.Object, GXml.Serializable
val = Value (typeof (GLib.Object));
this.get_property_value (prop, ref val);
child_object = val.get_object ();
- Document value_doc = Serialization.serialize_object (child_object);
+ xDocument value_doc = Serialization.serialize_object (child_object);
value_node = doc.create_element ("fake");
value_doc.document_element.copy (ref value_node, true);
//value_node = doc.copy_node (value_doc.document_element);
@@ -214,7 +214,7 @@ public class GXml.SerializableJson : GLib.Object, GXml.Serializable
Element obj_elem;
ParamSpec[] specs;
- if (node is Document) {
+ if (node is xDocument) {
obj_elem = node.owner_document.document_element;
}
else {
diff --git a/gxml/SerializableObjectModel.vala b/gxml/SerializableObjectModel.vala
index 733b2f9..1c4dfd0 100644
--- a/gxml/SerializableObjectModel.vala
+++ b/gxml/SerializableObjectModel.vala
@@ -95,7 +95,7 @@ public abstract class GXml.SerializableObjectModel : Object, Serializable
public virtual GXml.xNode? serialize (GXml.xNode node)
throws GLib.Error
requires (node_name () != null)
- requires (node is Document || node is Element)
+ requires (node is xDocument || node is Element)
{
return default_serialize (node);
}
@@ -105,9 +105,9 @@ public abstract class GXml.SerializableObjectModel : Object, Serializable
#if DEBUG
stdout.printf (@"$(get_type ().name ()): Serializing on node: $(node.node_name)\n");
#endif
- Document doc;
- if (node is Document)
- doc = (Document) node;
+ xDocument doc;
+ if (node is xDocument)
+ doc = (xDocument) node;
else
doc = node.owner_document;
var element = doc.create_element (node_name ());
@@ -225,9 +225,9 @@ public abstract class GXml.SerializableObjectModel : Object, Serializable
public GXml.xNode? default_deserialize (GXml.xNode node)
throws GLib.Error
{
- Document doc;
- if (node is Document) {
- doc = (Document) node;
+ xDocument doc;
+ if (node is xDocument) {
+ doc = (xDocument) node;
return_val_if_fail (doc.document_element != null, null);
}
else
diff --git a/gxml/Serialization.vala b/gxml/Serialization.vala
index 22937cb..c8e6a46 100644
--- a/gxml/Serialization.vala
+++ b/gxml/Serialization.vala
@@ -85,7 +85,7 @@ namespace GXml {
* data types not automatically supported by { link GXml.Serialization}.
*/
public class Serialization : GLib.Object {
- private static void print_debug (GXml.Document doc, GLib.Object object) {
+ private static void print_debug (GXml.xDocument doc, GLib.Object object) {
stdout.printf ("Object XML\n---\n%s\n", doc.to_string ());
stdout.printf ("object\n---\n");
@@ -102,7 +102,7 @@ namespace GXml {
*/
private static GXml.xNode serialize_property (GLib.Object object,
ParamSpec prop_spec,
- GXml.Document doc)
+ GXml.xDocument doc)
throws GLib.Error
{
Type type;
@@ -176,7 +176,7 @@ namespace GXml {
'GeeSortedSet' which is not equal to or more restrictive
than the type 'GeeBidirSortedSet' of the property
on the interface 'GeeBidirSortedSet' */
child_object = value.get_object ();
- Document value_doc = Serialization.serialize_object (child_object);
// catch serialisation errors?
+ xDocument value_doc = Serialization.serialize_object (child_object);
// catch serialisation errors?
// TODO: Make copy_node public to allow others to use it
value_node = doc.copy_node (value_doc.document_element);
} else if (type.name () == "gpointer") {
@@ -190,10 +190,10 @@ namespace GXml {
}
/**
- * Serializes a { link GLib.Object} into a { link GXml.Document}.
+ * Serializes a { link GLib.Object} into a { link GXml.xDocument}.
*
* This takes a { link GLib.Object} and serializes it
- * into a { link GXml.Document} which can be saved to
+ * into a { link GXml.xDocument} which can be saved to
* disk or transferred over a network. It handles
* serialization of primitive properties and some more
* complex ones like enums, other { link GLib.Object}s
@@ -211,11 +211,11 @@ namespace GXml {
* unsupported, or the property isn't known to the object).
*
* @param object A { link GLib.Object} to serialize
- * @return a { link GXml.Document} representing the serialized `object`
+ * @return a { link GXml.xDocument} representing the serialized `object`
*/
- public static GXml.Document serialize_object (GLib.Object object) throws GLib.Error
+ public static GXml.xDocument serialize_object (GLib.Object object) throws GLib.Error
{
- Document doc;
+ xDocument doc;
Element root;
ParamSpec[] prop_specs;
Element prop;
@@ -223,12 +223,12 @@ namespace GXml {
string oid;
Serialization.init_caches ();
- /* Create an XML Document to return the object
+ /* Create an XML xDocument to return the object
in. TODO: consider just returning an
<Object> node; but then we'd probably want
a separate document for it to already be a
part of as its owner_document. */
- doc = new Document ();
+ doc = new xDocument ();
if (object is Serializable) {
((Serializable) object).serialize (doc);
return doc;
@@ -314,7 +314,7 @@ namespace GXml {
/**
* FIXME: DON'T USE CACHE. SERIALIZE OVER NEW OBJECTS OR OVERWRITE PROPERTIES.
* When serialize a set of objects, you can add Node Elements <Object>
- * as many as objects you have serialized to the XML Document. On
+ * as many as objects you have serialized to the XML xDocument. On
* deserialization, you must create a new GObject, on the fly, for each
* <Object> tag found in the file.
*
@@ -345,10 +345,10 @@ namespace GXml {
}
/**
- * Deserialize a { link GXml.Document} back into a { link GLib.Object}.
+ * Deserialize a { link GXml.xDocument} back into a { link GLib.Object}.
*
- * This deserializes a { link GXml.Document} back into a
- * { link GLib.Object}. The { link GXml.Document}
+ * This deserializes a { link GXml.xDocument} back into a
+ * { link GLib.Object}. The { link GXml.xDocument}
* must represent a { link GLib.Object} as serialized
* by { link GXml.Serialization}. The types of the
* objects that are being deserialized must be known
@@ -356,10 +356,10 @@ namespace GXml {
* { link GXml.SerializationError} will result.
*
* @param type object type to deserialize
- * @param doc a { link GXml.Document} to deseralize from
+ * @param doc a { link GXml.xDocument} to deseralize from
* @return the deserialized { link GLib.Object}
*/
- public static GLib.Object deserialize_object (Type type, GXml.Document doc) throws GLib.Error
+ public static GLib.Object deserialize_object (Type type, GXml.xDocument doc) throws GLib.Error
{
if (type.is_a (typeof (Serializable))) {
Object object = Object.new (type);
diff --git a/gxml/libxml-Attr.vala b/gxml/libxml-Attr.vala
index 220f1f9..7806a4e 100644
--- a/gxml/libxml-Attr.vala
+++ b/gxml/libxml-Attr.vala
@@ -44,7 +44,7 @@ namespace GXml {
* (see { link GXml.Element}). Values are often represented as strings but can
* also be more complex subtrees for some nodes.
*
- * To create one, use { link GXml.Document.create_attribute}.
+ * To create one, use { link GXml.xDocument.create_attribute}.
*
* XML Example: Here, we have an Attr with the name 'flavour'
* and the value 'pumpkin'. {{{<pie flavour="pumpkin" />}}}
@@ -61,7 +61,7 @@ namespace GXml {
/* this displaces BackedNode's xmlNode node */
/** Constructors */
- internal Attr (Xml.Attr *node, Document doc) {
+ internal Attr (Xml.Attr *node, xDocument doc) {
// TODO: wish valac would warn against using this. before calling base()
//base (NodeType.ATTRIBUTE, doc);
base ((Xml.Node*)node, doc);
@@ -235,7 +235,7 @@ namespace GXml {
*
* For { link GXml.Attr} this method copy name and value.
*
- * @param node could be owned by other { link GXml.Document}.
+ * @param node could be owned by other { link GXml.xDocument}.
*
* @param deep paramenter have no effect.
*/
diff --git a/gxml/libxml-BackedNode.vala b/gxml/libxml-BackedNode.vala
index a2ff91f..9526256 100644
--- a/gxml/libxml-BackedNode.vala
+++ b/gxml/libxml-BackedNode.vala
@@ -37,13 +37,13 @@ namespace GXml {
/** Private properties */
internal Xml.Node *node;
- internal void set_xmlnode (Xml.Node *node, Document owner) {
+ internal void set_xmlnode (Xml.Node *node, xDocument owner) {
this.node = node;
owner.node_dict.insert (node, this);
}
/* Constructors */
- internal BackedNode (Xml.Node *node, Document owner) {
+ internal BackedNode (Xml.Node *node, xDocument owner) {
base ((NodeType)node->type, owner);
// Save the correspondence between this Xml.Node* and its Node
diff --git a/gxml/libxml-CDATASection.vala b/gxml/libxml-CDATASection.vala
index a27b8e3..fc712a0 100644
--- a/gxml/libxml-CDATASection.vala
+++ b/gxml/libxml-CDATASection.vala
@@ -2,7 +2,7 @@
/* CDataSection.vala
*
* Copyright (C) 2011-2013 Richard Schwarting <aquarichy gmail com>
- * Copyright (C) 2011 Daniel Espinosa <esodan gmail com>
+ * Copyright (C) 2011,2015 Daniel Espinosa <esodan gmail com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -30,14 +30,14 @@ namespace GXml {
* An XML CDATA section, which contains non-XML data that is
* stored in an XML document.
*
- * To create one, use { link GXml.Document.create_cdata_section}.
+ * To create one, use { link GXml.xDocument.create_cdata_section}.
*
* An XML example would be like:
* {{{ <![CDATA[Here contains non-XML data, like code, or something that requires a lot of special
XML entities.]]>.}}}
* It is a type of Text node. For more, see:
[[http://www.w3.org/TR/DOM-Level-1/level-one-core.html#ID-667469212]]
*/
public class CDATASection : Text {
- internal CDATASection (Xml.Node *cdata_node, Document doc) {
+ internal CDATASection (Xml.Node *cdata_node, xDocument doc) {
base (cdata_node, doc);
}
/**
diff --git a/gxml/libxml-CharacterData.vala b/gxml/libxml-CharacterData.vala
index d28330f..6c57499 100644
--- a/gxml/libxml-CharacterData.vala
+++ b/gxml/libxml-CharacterData.vala
@@ -2,7 +2,7 @@
/* CharacterData.vala
*
* Copyright (C) 2011-2013 Richard Schwarting <aquarichy gmail com>
- * Copyright (C) 2011 Daniel Espinosa <esodan gmail com>
+ * Copyright (C) 2011,2015 Daniel Espinosa <esodan gmail com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -65,7 +65,7 @@ namespace GXml {
}
}
- internal CharacterData (Xml.Node *char_node, Document doc) {
+ internal CharacterData (Xml.Node *char_node, xDocument doc) {
base (char_node, doc);
// TODO: if this was this (), it would recurse infinitely, maybe valac could detect
that
}
diff --git a/gxml/libxml-Comment.vala b/gxml/libxml-Comment.vala
index b1a5148..aeab40a 100644
--- a/gxml/libxml-Comment.vala
+++ b/gxml/libxml-Comment.vala
@@ -2,7 +2,7 @@
/* Comment.vala
*
* Copyright (C) 2011-2013 Richard Schwarting <aquarichy gmail com>
- * Copyright (C) 2011 Daniel Espinosa <esodan gmail com>
+ * Copyright (C) 2011,2015 Daniel Espinosa <esodan gmail com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -28,7 +28,7 @@
/**
* An XML comment.
*
- * To create one, use { link GXml.Document.create_comment}.
+ * To create one, use { link GXml.xDocument.create_comment}.
*
* An XML example looks like: {{{ <someNode>
* <!-- this is a comment -->
@@ -37,8 +37,8 @@
* For more, see: [[http://www.w3.org/TR/DOM-Level-1/level-one-core.html#ID-1728279322]]
*/
public class GXml.Comment : GXml.CharacterData {
- // TODO: Can I make this only accessible from within the GXml.Dom namespace (e.g. from
GXml.Dom.Document?)
- internal Comment (Xml.Node *comment_node, Document doc) {
+ // TODO: Can I make this only accessible from within the GXml.Dom namespace (e.g. from
GXml.Dom.xDocument?)
+ internal Comment (Xml.Node *comment_node, xDocument doc) {
base (comment_node, doc);
}
public override string node_name {
diff --git a/gxml/libxml-Document.vala b/gxml/libxml-Document.vala
index 6a04cc2..03aa61b 100644
--- a/gxml/libxml-Document.vala
+++ b/gxml/libxml-Document.vala
@@ -1,5 +1,5 @@
/* -*- Mode: vala; indent-tabs-mode: t; c-basic-offset: 2; tab-width: 2 -*- */
-/* Document.vala
+/* xDocument.vala
*
* Copyright (C) 2011-2013 Richard Schwarting <aquarichy gmail com>
* Copyright (C) 2011-2015 Daniel Espinosa <esodan gmail com>
@@ -24,7 +24,7 @@
/* TODO:
- * * later on, go over libxml2 docs for Tree and xNode and Document, etc., and see if we're missing anything
significant
+ * * later on, go over libxml2 docs for Tree and xNode and xDocument, etc., and see if we're missing
anything significant
* * compare performance between libxml2 and GXml (should be a little different, but not too much)
*/
@@ -47,16 +47,16 @@ namespace GXml {
}
/**
- * Represents an XML Document as a tree of { link GXml.xNode}s.
+ * Represents an XML xDocument as a tree of { link GXml.xNode}s.
*
- * The Document has a root document element { link GXml.Element}.
- * A Document's schema can be defined through its
+ * The xDocument has a root document element { link GXml.Element}.
+ * A xDocument's schema can be defined through its
* { link GXml.DocumentType}.
*
* Version: DOM Level 1 Core<<BR>>
- * URL: [[http://www.w3.org/TR/DOM-Level-1/level-one-core.html#i-Document]]
+ * URL: [[http://www.w3.org/TR/DOM-Level-1/level-one-core.html#i-xDocument]]
*/
- public class Document : xNode {
+ public class xDocument : xNode {
/* *** Private properties *** */
/**
@@ -85,7 +85,7 @@ namespace GXml {
/* TODO: for future reference, find out if internals
are only accessible by children when they're
compiled together. I have a test that had a
- separately compiled TestDocument : Document class,
+ separately compiled TestDocument : xDocument class,
and it couldn't access the internal xmldoc. */
internal Xml.Doc *xmldoc;
@@ -126,7 +126,7 @@ namespace GXml {
case NodeType.ATTRIBUTE:
new Attr ((Xml.Attr*)xmlnode, this);
break;
- /* TODO: These are not yet implemented (but we won't support Document
*/
+ /* TODO: These are not yet implemented (but we won't support
xDocument */
case NodeType.ENTITY_REFERENCE:
case NodeType.ENTITY:
case NodeType.PROCESSING_INSTRUCTION:
@@ -159,7 +159,7 @@ namespace GXml {
// TODO: DTD, sort of works
/**
- * The Document Type Definition (DTD) defining this document. This may be %NULL.
+ * The xDocument Type Definition (DTD) defining this document. This may be %NULL.
*
* Version: DOM Level 1 Core<<BR>>
* URL: [[http://www.w3.org/TR/REC-DOM-Level-1/level-one-core.html#attribute-doctype]]
@@ -187,7 +187,7 @@ namespace GXml {
* URL: [[http://www.w3.org/TR/REC-DOM-Level-1/level-one-core.html#attribute-documentElement]]
*/
public Element document_element {
- // TODO: should children work at all on Document, or just this, to get root?
+ // TODO: should children work at all on xDocument, or just this, to get root?
get {
return (Element)this.lookup_node (this.xmldoc->get_root_element ());
}
@@ -195,12 +195,12 @@ namespace GXml {
}
}
- /* A list of strong references to all GXml.Nodes that this Document has created */
+ /* A list of strong references to all GXml.Nodes that this xDocument has created */
private List<GXml.xNode> nodes_to_free = new List<GXml.xNode> ();
/* A list of references to Xml.Nodes that were created, and may require freeing */
private List<Xml.Node*> new_nodes = new List<Xml.Node*> ();
- ~Document () {
+ ~xDocument () {
List<Xml.Node*> to_free = new List<Xml.Node*> ();
/* we use two separate loops, because freeing
@@ -223,20 +223,20 @@ namespace GXml {
/** Constructors */
/**
- * Creates a Document from a given Implementation, supporting
+ * Creates a xDocument from a given Implementation, supporting
* the {@ GXml.Implementation.create_document} method.
*
* Version: DOM Level 3 Core<<BR>>
* URL: [[http://www.w3.org/TR/DOM-Level-3-Core/core.html#Level-2-Core-DOM-createDocument]]
*
- * @param impl Implementation creating this Document
- * @param namespace_uri URI for the namespace in which this Document belongs, or %NULL
- * @param qualified_name A qualified name for the Document, or %NULL
+ * @param impl Implementation creating this xDocument
+ * @param namespace_uri URI for the namespace in which this xDocument belongs, or %NULL
+ * @param qualified_name A qualified name for the xDocument, or %NULL
* @param doctype The type of the document, or %NULL
*
* @return The new document; this must be freed with { link GLib.Object.unref}
*/
- internal Document.with_implementation (Implementation impl, string? namespace_uri, string?
qualified_name, DocumentType? doctype) {
+ internal xDocument.with_implementation (Implementation impl, string? namespace_uri, string?
qualified_name, DocumentType? doctype) {
this ();
this.implementation = impl;
@@ -251,14 +251,14 @@ namespace GXml {
}
/**
- * Creates a Document based on a libxml2 Xml.Doc* object.
+ * Creates a xDocument based on a libxml2 Xml.Doc* object.
*
* @param doc A { link Xml.Doc} from libxml2
* @param require_root A flag to indicate whether we should require a root node, which the
DOM normally expects
*
- * @return A new { link GXml.Document} wrapping the provided { link Xml.Doc}; this must be
freed with { link GLib.Object.unref}
+ * @return A new { link GXml.xDocument} wrapping the provided { link Xml.Doc}; this must be
freed with { link GLib.Object.unref}
*/
- public Document.from_libxml2 (Xml.Doc *doc, bool require_root = true) {
+ public xDocument.from_libxml2 (Xml.Doc *doc, bool require_root = true) {
/* All other constructors should call this one,
passing it a Xml.Doc* object */
@@ -289,15 +289,15 @@ namespace GXml {
}
/**
- * Creates a Document from the file at file_path.
+ * Creates a xDocument from the file at file_path.
*
* @param file_path A path to an XML document
*
- * @return A { link GXml.Document} for the given `file_path`; this must be freed with { link
GLib.Object.unref}
+ * @return A { link GXml.xDocument} for the given `file_path`; this must be freed with { link
GLib.Object.unref}
*
* @throws GXml.Error A { link GXml.Error} if an error occurs while loading
*/
- public Document.from_path (string file_path) throws GXml.Error {
+ public xDocument.from_path (string file_path) throws GXml.Error {
Xml.ParserCtxt ctxt;
Xml.Doc *doc;
Xml.Error *e;
@@ -314,7 +314,7 @@ namespace GXml {
this.from_libxml2 (doc);
}
- /* For { link GXml.Document.save_to_stream}, to write the document in chunks. */
+ /* For { link GXml.xDocument.save_to_stream}, to write the document in chunks. */
internal static int _iowrite (void *ctx, char[] buf, int len) {
// TODO: can we make this private?
OutputStreamBox *box = (OutputStreamBox*)ctx;
@@ -333,7 +333,7 @@ namespace GXml {
return bytes_writ;
}
- /* For { link GXml.Document.from_stream}, to read the document in chunks. */
+ /* For { link GXml.xDocument.from_stream}, to read the document in chunks. */
internal static int _iooutclose (void *ctx) {
// TODO: can we make this private?
OutputStreamBox *box = (OutputStreamBox*)ctx;
@@ -393,17 +393,17 @@ namespace GXml {
}
/**
- * Creates a Document for the { link GLib.File} `fin`.
+ * Creates a xDocument for the { link GLib.File} `fin`.
*
* @param fin The { link GLib.File} containing the document
* @param can A { link GLib.Cancellable} to let you cancel opening the file, or %NULL
*
- * @return A new { link GXml.Document} for `fin`; this must be freed with { link
GLib.Object.unref}
+ * @return A new { link GXml.xDocument} for `fin`; this must be freed with { link
GLib.Object.unref}
*
* @throws GLib.Error A { link GLib.Error} if an error cocurs while reading the { link
GLib.File}
* @throws GXml.Error A { link GXml.Error} if an error occurs while reading the file as a
stream
*/
- public Document.from_gfile (File fin, Cancellable? can = null) throws GXml.Error, GLib.Error {
+ public xDocument.from_gfile (File fin, Cancellable? can = null) throws GXml.Error, GLib.Error
{
// TODO: actually handle cancellable
InputStream instream;
@@ -418,19 +418,19 @@ namespace GXml {
}
/**
- * Creates a { link GXml.Document} from data provided
+ * Creates a { link GXml.xDocument} from data provided
* through a { link GLib.InputStream}.
*
* @param instream A { link GLib.InputStream} providing our document
* @param can A { link GLib.Cancellable} object allowing the caller
* to interrupt and cancel this operation, or %NULL
*
- * @return A new { link GXml.Document} built from the contents of instream;
+ * @return A new { link GXml.xDocument} built from the contents of instream;
* this must be freed with { link GLib.Object.unref}
*
* @throws GXml.Error A { link GXml.Error} if an error occurs while reading the stream
*/
- public Document.from_stream (InputStream instream, Cancellable? can = null) throws GXml.Error
{
+ public xDocument.from_stream (InputStream instream, Cancellable? can = null) throws
GXml.Error {
InputStreamBox box = { instream, can };
Xml.Doc *doc;
/* TODO: provide Cancellable as user data so we can actually
@@ -465,28 +465,28 @@ namespace GXml {
}
/**
- * Creates a Document from data found in memory.
+ * Creates a xDocument from data found in memory.
*
* @param xml A string representing an XML document
*
- * @return A new { link GXml.Document} from `memory`; this must be freed with { link
GLib.Object.unref}
+ * @return A new { link GXml.xDocument} from `memory`; this must be freed with { link
GLib.Object.unref}
*/
- public Document.from_string (string xml) {
+ public xDocument.from_string (string xml) {
Xml.Doc *doc;
doc = Xml.Parser.parse_memory (xml, (int)xml.length);
this.from_libxml2 (doc);
}
/**
- * Creates a Document from data found in memory using options.
+ * Creates a xDocument from data found in memory using options.
*
* @param xml: A string representing an XML document
* @param url: the base URL to use for the document
* @param encoding: the document encoding
* @param options: a combination of { link Xml.ParserOption}
*
- * @return A new { link GXml.Document} from `memory`; this must be freed with { link
GLib.Object.unref}
+ * @return A new { link GXml.xDocument} from `memory`; this must be freed with { link
GLib.Object.unref}
*/
- public Document.from_string_with_options (string xml, string? url = null,
+ public xDocument.from_string_with_options (string xml, string? url = null,
string? encoding = null,
int options = 0)
{
@@ -498,9 +498,9 @@ namespace GXml {
/**
* Creates an empty document.
*
- * @return A new, empty { link GXml.Document}; this must be freed with { link
GLib.Object.unref}
+ * @return A new, empty { link GXml.xDocument}; this must be freed with { link
GLib.Object.unref}
*/
- public Document () {
+ public xDocument () {
Xml.Doc *doc;
doc = new Xml.Doc ();
@@ -508,7 +508,7 @@ namespace GXml {
}
/**
- * Saves a Document to the file at path file_path
+ * Saves a xDocument to the file at path file_path
*
* @param file_path A path on the local system to save the document to
*
@@ -545,7 +545,7 @@ namespace GXml {
*/
/**
- * Saves a Document to the OutputStream outstream.
+ * Saves a xDocument to the OutputStream outstream.
*
* @param outstream A destination { link GLib.OutputStream} to save the XML file to
* @param can A { link GLib.Cancellable} to cancel saving with, or %NULL
@@ -622,7 +622,7 @@ namespace GXml {
/**
* Creates a { link GXml.DocumentFragment}.
*
- * Document fragments do not can contain a subset of a
+ * xDocument fragments do not can contain a subset of a
* document, without being a complete tree. Its
* memory is freed when its owner document is freed.
*
@@ -743,7 +743,7 @@ namespace GXml {
We want to manage it with the GXmlDocument, though, and not
make the developer manage it, because that would be inconsistent
with the rest of the tree (even if the user doesn't insert
- this PI into a Document at all. */
+ this PI into a xDocument at all. */
check_not_supported_html ("processing instructions");
check_invalid_characters (target, "processing instruction");
@@ -936,7 +936,7 @@ namespace GXml {
/**
* Inserts `new_child` into this document before
* `ref_child`, an existing child of this
- * { link GXml.Document}. A document can only have one
+ * { link GXml.xDocument}. A document can only have one
* { link GXml.Element} child (the root element) and
* one { link GXml.DocumentType}.
*
diff --git a/gxml/libxml-DocumentFragment.vala b/gxml/libxml-DocumentFragment.vala
index a699d46..a22c718 100644
--- a/gxml/libxml-DocumentFragment.vala
+++ b/gxml/libxml-DocumentFragment.vala
@@ -2,7 +2,7 @@
/* DocumentFragment.vala
*
* Copyright (C) 2011-2013 Richard Schwarting <aquarichy gmail com>
- * Copyright (C) 2011 Daniel Espinosa <esodan gmail com>
+ * Copyright (C) 201, 2015 Daniel Espinosa <esodan gmail com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -24,7 +24,7 @@
*/
namespace GXml {
- /* Lightweight Document object for fragments
+ /* Lightweight xDocument object for fragments
has a root for the fragment, the fragment of the document is a child to this root
if you insert the fragment into a node, the fragment's root is lost and replaced by the receiving
node
@@ -39,9 +39,9 @@ namespace GXml {
*/
/**
- * An partial portion of a { link GXml.Document}, not necessarily valid XML.
+ * An partial portion of a { link GXml.xDocument}, not necessarily valid XML.
*
- * To create one, use { link GXml.Document.create_document_fragment}.
+ * To create one, use { link GXml.xDocument.create_document_fragment}.
*
* This does not need to have a root document element,
* or being completely valid. It can have multiple children,
@@ -53,8 +53,9 @@ namespace GXml {
* URL: [[http://www.w3.org/TR/REC-DOM-Level-1/level-one-core.html#ID-B63ED1A3]]
*/
public class DocumentFragment : BackedNode {
- internal DocumentFragment (Xml.Node *fragment_node, Document doc) {
+ internal DocumentFragment (Xml.Node *fragment_node, xDocument doc) {
base (fragment_node, doc);
}
}
}
+
diff --git a/gxml/libxml-DocumentType.vala b/gxml/libxml-DocumentType.vala
index e3471cd..6e866c9 100644
--- a/gxml/libxml-DocumentType.vala
+++ b/gxml/libxml-DocumentType.vala
@@ -25,7 +25,7 @@
namespace GXml {
/**
- * Defines a Document, such as the entities that it can use.
+ * Defines a xDocument, such as the entities that it can use.
*
* For more, see: [[http://www.w3.org/TR/DOM-Level-1/level-one-core.html#ID-412266927]]
*/
@@ -34,7 +34,7 @@ namespace GXml {
private Xml.Dtd *ext_subset;
/** Constructor */
- internal DocumentType (Xml.Dtd *int_subset, Xml.Dtd *ext_subset, Document doc) {
+ internal DocumentType (Xml.Dtd *int_subset, Xml.Dtd *ext_subset, xDocument doc) {
// TODO: for name, we want a real name of the doc type
base (NodeType.DOCUMENT_TYPE, doc);
diff --git a/gxml/libxml-Element.vala b/gxml/libxml-Element.vala
index 9e792dc..46f016e 100644
--- a/gxml/libxml-Element.vala
+++ b/gxml/libxml-Element.vala
@@ -28,7 +28,7 @@ namespace GXml {
/**
* Represent an XML Element node, which have attributes and children.
*
- * To create one, use { link GXml.Document.create_element}.
+ * To create one, use { link GXml.xDocument.create_element}.
*
* These can have child nodes
* of various types including other Elements. Elements can
@@ -61,7 +61,7 @@ namespace GXml {
get {
// This is the same as node_name from Node:
// http://www.w3.org/TR/DOM-Level-1/level-one-core.html
- // TODO: is this the same as tagname from Document's get_elem_by...?
+ // TODO: is this the same as tagname from xDocument's get_elem_by...?
return base.node_name;
}
private set {
@@ -94,7 +94,7 @@ namespace GXml {
* other methods are reflected in the attributes
*
* Do not free this or its contents. It's memory will
- * be released when the owning { link GXml.Document}
+ * be released when the owning { link GXml.xDocument}
* is freed.
*/
public override NamedAttrMap? attributes {
@@ -110,7 +110,7 @@ namespace GXml {
}
/* Constructors */
- internal Element (Xml.Node *node, Document doc) {
+ internal Element (Xml.Node *node, xDocument doc) {
base (node, doc);
// TODO: consider string ownership, libxml2 memory
}
@@ -216,7 +216,7 @@ namespace GXml {
return this.attributes.remove_named_item (old_attr.name);
}
- // TODO: consider making the life of TagNameNodeLists optional, and dead by default, at the
Document level
+ // TODO: consider making the life of TagNameNodeLists optional, and dead by default, at the
xDocument level
private void check_add_tag_name (Element basenode, xNode child) {
// TODO: make sure there aren't any other NodeTypes that could have elements as
children
if (child.node_type == NodeType.ELEMENT || child.node_type ==
NodeType.DOCUMENT_FRAGMENT) {
@@ -465,7 +465,7 @@ namespace GXml {
* For { link GXml.Element} this method copy attributes and child nodes
* when @deep is set to true.
*
- * @param node: could be owned by other { link GXml.Document}.
+ * @param node: could be owned by other { link GXml.xDocument}.
* @param deep: copy child nodes if true.
*/
public override bool copy (ref xNode node, bool deep = false)
diff --git a/gxml/libxml-Entity.vala b/gxml/libxml-Entity.vala
index c50f318..c82d2cb 100644
--- a/gxml/libxml-Entity.vala
+++ b/gxml/libxml-Entity.vala
@@ -70,7 +70,7 @@ namespace GXml {
}
}
- internal Entity (Xml.Entity *entity, Document doc) {
+ internal Entity (Xml.Entity *entity, xDocument doc) {
base (NodeType.ENTITY, doc);
this.entity = entity;
diff --git a/gxml/libxml-EntityReference.vala b/gxml/libxml-EntityReference.vala
index 9b05555..39d6488 100644
--- a/gxml/libxml-EntityReference.vala
+++ b/gxml/libxml-EntityReference.vala
@@ -32,13 +32,13 @@ namespace GXml {
/**
* A reference to an unparsed { link GXml.Entity}, like "'" for an apostrophe.
*
- * To create one, use { link GXml.Document.create_entity_reference}.
+ * To create one, use { link GXml.xDocument.create_entity_reference}.
*
* The entity name, e.g. "apos", is stored as the EntityReference's `node_name`.
* For more, see: [[http://www.w3.org/TR/DOM-Level-1/level-one-core.html#ID-11C98490]]
*/
public class EntityReference : xNode {
- internal EntityReference (string refname, Document doc) {
+ internal EntityReference (string refname, xDocument doc) {
// TODO: may want to handle refname differently
base (NodeType.ENTITY_REFERENCE, doc); // TODO: what should we pass up?
this.node_name = refname;
diff --git a/gxml/libxml-Implementation.vala b/gxml/libxml-Implementation.vala
index 01456eb..eb72a2f 100644
--- a/gxml/libxml-Implementation.vala
+++ b/gxml/libxml-Implementation.vala
@@ -27,7 +27,7 @@ namespace GXml {
* Describes the features available in this
* implementation of the DOM.
*
- * This can be accessed from a { link GXml.Document}
+ * This can be accessed from a { link GXml.xDocument}
* object. Provided a possible feature and the feature's
* version, it can tell the client whether it is here
* implemented.
@@ -44,7 +44,7 @@ namespace GXml {
GXml.warning (DomException.NAMESPACE, "qualified_name is null but
namespace_uri [%s] is not. Both should either be null or not null.".printf (namespace_uri));
}
if (qualified_name != null) {
- Document.check_invalid_characters (qualified_name, "new Document's root");
+ xDocument.check_invalid_characters (qualified_name, "new Document's root");
string[] parts = qualified_name.split (":");
if (parts.length == 2) {
@@ -76,25 +76,25 @@ namespace GXml {
}
/**
- * Creates a Document according to this { link GXml.Implementation}.
+ * Creates a xDocument according to this { link GXml.Implementation}.
*
* Version: DOM Level 3 Core<<BR>>
* URL: [[http://www.w3.org/TR/DOM-Level-3-Core/core.html#Level-2-Core-DOM-createDocument]]
- * @param namespace_uri URI for the namespace in which this Document belongs, or %NULL
- * @param qualified_name A qualified name for the Document, or %NULL
+ * @param namespace_uri URI for the namespace in which this xDocument belongs, or %NULL
+ * @param qualified_name A qualified name for the xDocument, or %NULL
* @param doctype The type of the document, or %NULL
*
* @return The new document
*/
- public Document create_document (string? namespace_uri, string? qualified_name, DocumentType?
doctype) {
- Document doc;
+ public xDocument create_document (string? namespace_uri, string? qualified_name,
DocumentType? doctype) {
+ xDocument doc;
check_namespace (namespace_uri, qualified_name);
check_wrong_document (doctype);
// TODO: also want to report if the doctype was created by a different
implementation; of which we have no way of determining right now
- doc = new Document.with_implementation (this, namespace_uri, qualified_name, doctype);
+ doc = new xDocument.with_implementation (this, namespace_uri, qualified_name,
doctype);
return doc;
}
diff --git a/gxml/libxml-NamespaceAttr.vala b/gxml/libxml-NamespaceAttr.vala
index e6a8cfc..db4f0a0 100644
--- a/gxml/libxml-NamespaceAttr.vala
+++ b/gxml/libxml-NamespaceAttr.vala
@@ -2,7 +2,7 @@
/* NamespaceAttr.vala
*
* Copyright (C) 2011-2013 Richard Schwarting <aquarichy gmail com>
- * Copyright (C) 2011 Daniel Espinosa <esodan gmail com>
+ * Copyright (C) 2011,2015 Daniel Espinosa <esodan gmail com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -35,7 +35,7 @@ namespace GXml {
private Xml.Ns *ns; // XPATH:TODO: do they extend us?
/** Constructors */
- internal NamespaceAttr (Xml.Ns *ns, Document doc) {
+ internal NamespaceAttr (Xml.Ns *ns, xDocument doc) {
// TODO: wish valac would warn against using this. before calling base()
base (NodeType.ATTRIBUTE, doc); // TODO: want something other than ATTRIBUTE?
this.ns = ns;
diff --git a/gxml/libxml-Node.vala b/gxml/libxml-Node.vala
index f240689..20383b3 100644
--- a/gxml/libxml-Node.vala
+++ b/gxml/libxml-Node.vala
@@ -27,9 +27,9 @@ namespace GXml {
/**
* Represents an XML xNode, the base class for most XML structures in
- * the { link GXml.Document}'s tree.
+ * the { link GXml.xDocument}'s tree.
*
- * { link GXml.Document}s are { link GXml.xNode}s, and are
+ * { link GXml.xDocument}s are { link GXml.xNode}s, and are
* composed of a tree of { link GXml.xNode}s.
*
* Version: DOM Level 1 Core<<BR>>
@@ -37,7 +37,7 @@ namespace GXml {
*/
public abstract class xNode : GLib.Object {
/* Constructors */
- internal xNode (NodeType type, Document owner) {
+ internal xNode (NodeType type, xDocument owner) {
this.node_type = type;
this.owner_document = owner;
}
@@ -49,10 +49,10 @@ namespace GXml {
/* Utility methods */
internal void check_wrong_document (xNode node) {
- Document this_doc;
+ xDocument this_doc;
if (this.node_type == NodeType.DOCUMENT) {
- this_doc = (GXml.Document)this;
+ this_doc = (GXml.xDocument)this;
} else {
this_doc = this.owner_document;
}
@@ -116,7 +116,7 @@ namespace GXml {
* support.
*
* Do not free this. It's memory will be released
- * when the owning { link GXml.Document} is freed.
+ * when the owning { link GXml.xDocument} is freed.
*
* Version: DOM Level 2 Core<<BR>>
* URL: [[http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-NodeNSname]]
@@ -152,7 +152,7 @@ namespace GXml {
* Core that were created with namespace support.
*
* Do not free this. It's memory will be released
- * when the owning { link GXml.Document} is freed.
+ * when the owning { link GXml.xDocument} is freed.
*
* Version: DOM Level 2 Core<<BR>>
* URL: [[http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-NodeNSPrefix]]
@@ -171,7 +171,7 @@ namespace GXml {
* Core that were created with namespace support.
*
* Do not free this. It's memory will be released
- * when the owning { link GXml.Document} is freed.
+ * when the owning { link GXml.xDocument} is freed.
*
* Version: DOM Level 2 Core<<BR>>
* URL: [[http://www.w3.org/TR/DOM-Level-2-Core/core.html#ID-NodeNSLocalN]]
@@ -192,7 +192,7 @@ namespace GXml {
* pair.
*
* Do not free this. It's memory will be released
- * when the owning { link GXml.Document} is freed.
+ * when the owning { link GXml.xDocument} is freed.
*
* Version: DOM Level 1 Core<<BR>>
* URL: [[http://www.w3.org/TR/REC-DOM-Level-1/level-one-core.html#ID-F68D095]]
@@ -207,7 +207,7 @@ namespace GXml {
* can be %NULL.
*
* Do not free this. It's memory will be released
- * when the owning { link GXml.Document} is freed.
+ * when the owning { link GXml.xDocument} is freed.
*
* Version: DOM Level 1 Core<<BR>>
* URL: [[http://www.w3.org/TR/REC-DOM-Level-1/level-one-core.html#ID-F68D080]]
@@ -224,7 +224,7 @@ namespace GXml {
private NodeType _node_type;
/**
* Stores the type of node. Most XML structures are
- * nodes of different types, like { link GXml.Document}
+ * nodes of different types, like { link GXml.xDocument}
* as a { link GXml.NodeType.DOCUMENT}, { link GXml.Attr}
* as a { link GXml.NodeType.ATTRIBUTE}, Element as a
* { link GXml.NodeType.ELEMENT}, etc.
@@ -250,7 +250,7 @@ namespace GXml {
* XML example: {{{<parent><child></child></parent>}}}
*
* Do not free this. It's memory will be released
- * when the owning { link GXml.Document} is freed.
+ * when the owning { link GXml.xDocument} is freed.
*
* Version: DOM Level 1 Core<<BR>>
* URL: [[http://www.w3.org/TR/REC-DOM-Level-1/level-one-core.html#ID-1060184317]]
@@ -293,7 +293,7 @@ namespace GXml {
* children, it returns %NULL.
*
* Do not free this. It's memory will be released
- * when the owning { link GXml.Document} is freed.
+ * when the owning { link GXml.xDocument} is freed.
*
* Version: DOM Level 1 Core<<BR>>
* URL: [[http://www.w3.org/TR/REC-DOM-Level-1/level-one-core.html#ID-169727388]]
@@ -308,7 +308,7 @@ namespace GXml {
* children, it returns %NULL.
*
* Do not free this. It's memory will be released
- * when the owning { link GXml.Document} is freed.
+ * when the owning { link GXml.xDocument} is freed.
*
* Version: DOM Level 1 Core<<BR>>
* URL: [[http://www.w3.org/TR/REC-DOM-Level-1/level-one-core.html#ID-61AD09FB]]
@@ -324,7 +324,7 @@ namespace GXml {
* that the children of a node are ordered.
*
* Do not free this. It's memory will be released
- * when the owning { link GXml.Document} is freed.
+ * when the owning { link GXml.xDocument} is freed.
*
* Version: DOM Level 1 Core<<BR>>
* URL: [[http://www.w3.org/TR/REC-DOM-Level-1/level-one-core.html#ID-640FB3C8]]
@@ -340,7 +340,7 @@ namespace GXml {
* children of a node are ordered.
*
* Do not free this. It's memory will be released
- * when the owning { link GXml.Document} is freed.
+ * when the owning { link GXml.xDocument} is freed.
*
* Version: DOM Level 1 Core<<BR>>
* URL: [[http://www.w3.org/TR/REC-DOM-Level-1/level-one-core.html#ID-6AC54C2F]]
@@ -358,7 +358,7 @@ namespace GXml {
* `attributes` is %NULL.
*
* Do not free this. It's memory will be released
- * when the owning { link GXml.Document} is freed.
+ * when the owning { link GXml.xDocument} is freed.
*
* Version: DOM Level 1 Core<<BR>>
* URL: [[http://www.w3.org/TR/REC-DOM-Level-1/level-one-core.html#ID-84CF09]]
@@ -373,16 +373,16 @@ namespace GXml {
}
/**
- * A link to the { link GXml.Document} to which this node belongs.
+ * A link to the { link GXml.xDocument} to which this node belongs.
*
* Do not free this unless you intend to free all
- * memory owned by the { link GXml.Document}, including this
+ * memory owned by the { link GXml.xDocument}, including this
* { link GXml.xNode}.
*
* Version: DOM Level 1 Core<<BR>>
* URL: [[http://www.w3.org/TR/REC-DOM-Level-1/level-one-core.html#node-ownerDoc]]
*/
- public weak Document owner_document {
+ public weak xDocument owner_document {
get;
internal set;
}
@@ -408,7 +408,7 @@ namespace GXml {
*
* @return { link new_child}, the node that has been
* inserted. Do not free it, its memory will be
- * released when the owning { link GXml.Document} is
+ * released when the owning { link GXml.xDocument} is
* freed.
*/
public virtual unowned xNode? insert_before (xNode new_child, xNode? ref_child) {
@@ -425,7 +425,7 @@ namespace GXml {
* @param old_child A { link GXml.xNode} that will be removed and replaced by { link
new_child}
*
* @return The removed node { link old_child}. Do not free it, its memory will be
- * released when the owning { link GXml.Document} is
+ * released when the owning { link GXml.xDocument} is
* freed.
*/
public virtual unowned xNode? replace_child (xNode new_child, xNode old_child) {
@@ -442,7 +442,7 @@ namespace GXml {
* @param old_child The { link GXml.xNode} child to remove from the current one
*
* @return The removed node { link old_child}. Do not free it, its memory will be
- * released when the owning { link GXml.Document} is
+ * released when the owning { link GXml.xDocument} is
* freed
*/
public virtual unowned xNode? remove_child (xNode old_child) {
@@ -461,7 +461,7 @@ namespace GXml {
* become the last child of this current node
*
* @return The newly added child, { link new_child}. Do not free it, its memory will be
- * released when the owning { link GXml.Document} is
+ * released when the owning { link GXml.xDocument} is
* freed.
*/
public virtual unowned xNode? append_child (xNode new_child) {
@@ -492,7 +492,7 @@ namespace GXml {
*
* @return A parentless clone of this node. Do not
* free it, its memory will be released when the owning
- * { link GXml.Document} is freed.
+ * { link GXml.xDocument} is freed.
*/
public virtual unowned xNode? clone_node (bool deep) {
return null;
diff --git a/gxml/libxml-NodeList.vala b/gxml/libxml-NodeList.vala
index 27874b1..e6c33f6 100644
--- a/gxml/libxml-NodeList.vala
+++ b/gxml/libxml-NodeList.vala
@@ -44,7 +44,7 @@ namespace GXml {
{
/* NOTE:
* children should define constructors like:
- * internal NodeList (Xml.Node* head, Document owner);
+ * internal NodeList (Xml.Node* head, xDocument owner);
*/
/**
@@ -112,7 +112,7 @@ namespace GXml {
* time, or get reconstructed-on-the-go?
*/
internal class TagNameNodeList : GXml.ArrayList { internal string tag_name;
- internal TagNameNodeList (string tag_name, xNode root, Document owner) {
+ internal TagNameNodeList (string tag_name, xNode root, xDocument owner) {
base (root);
this.tag_name = tag_name;
}
@@ -121,14 +121,14 @@ namespace GXml {
// /* TODO: warning: this list should NOT be edited :(
// we need a new, better live AttrNodeList :| */
// internal class AttrNodeList : GListNodeList {
- // internal AttrNodeList (xNode root, Document owner) {
+ // internal AttrNodeList (xNode root, xDocument owner) {
// base (root);
// base.nodes = root.attributes.get_values ();
// }
// }
internal class NamespaceAttrNodeList : GXml.ArrayList {
- internal NamespaceAttrNodeList (BackedNode root, Document owner) {
+ internal NamespaceAttrNodeList (BackedNode root, xDocument owner) {
base (root);
for (Xml.Ns *cur = root.node->ns_def; cur != null; cur = cur->next) {
this.append_child (new NamespaceAttr (cur, owner));
@@ -148,7 +148,7 @@ namespace GXml {
}
}
- internal NodeChildNodeList (Xml.Node *parent, Document owner) {
+ internal NodeChildNodeList (Xml.Node *parent, xDocument owner) {
this.parent = parent;
this.owner = owner;
}
@@ -176,7 +176,7 @@ namespace GXml {
}
}
- internal AttrChildNodeList (Xml.Attr* parent, Document owner) {
+ internal AttrChildNodeList (Xml.Attr* parent, xDocument owner) {
this.parent = parent;
this.owner = owner;
}
@@ -219,7 +219,7 @@ namespace GXml {
}
}
- internal EntityChildNodeList (Xml.Entity* parent, Document owner) {
+ internal EntityChildNodeList (Xml.Entity* parent, xDocument owner) {
this.parent = parent;
this.owner = owner;
}
@@ -234,7 +234,7 @@ namespace GXml {
same with nodes from GetElementByTagName, made need separate impls for each */
// TODO: if necessary, create two versions that use parent instead of head
- internal weak Document owner;
+ internal weak xDocument owner;
internal abstract Xml.Node *head { get; set; }
internal abstract Xml.Node *parent_as_xmlnode { get; }
@@ -400,7 +400,7 @@ namespace GXml {
private class NodeListIterator : GLib.Object, Gee.Traversable<xNode>, Gee.Iterator<xNode>
{
- private weak Document doc;
+ private weak xDocument doc;
private Xml.Node *cur;
private Xml.Node *head;
diff --git a/gxml/libxml-Notation.vala b/gxml/libxml-Notation.vala
index 3e2ead2..e91be86 100644
--- a/gxml/libxml-Notation.vala
+++ b/gxml/libxml-Notation.vala
@@ -2,7 +2,7 @@
/* Notation.vala
*
* Copyright (C) 2011-2013 Richard Schwarting <aquarichy gmail com>
- * Copyright (C) 2011 Daniel Espinosa <esodan gmail com>
+ * Copyright (C) 2011,2015 Daniel Espinosa <esodan gmail com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -66,7 +66,7 @@ namespace GXml {
private set {
}
}
- internal Notation (/* Xml.Notation *notation, */ Document doc) {
+ internal Notation (/* Xml.Notation *notation, */ xDocument doc) {
base (NodeType.NOTATION, doc); // STUB
//this.notation = notation;
}
diff --git a/gxml/libxml-ProcessingInstruction.vala b/gxml/libxml-ProcessingInstruction.vala
index be8c970..cf35fb7 100644
--- a/gxml/libxml-ProcessingInstruction.vala
+++ b/gxml/libxml-ProcessingInstruction.vala
@@ -31,7 +31,7 @@ namespace GXml {
* Stores processor-specific information with the document in
* a textual format.
*
- * To create one, use { link GXml.Document.create_processing_instruction}.
+ * To create one, use { link GXml.xDocument.create_processing_instruction}.
*
* For an example of a ProcessingInstruction, this one specifies a stylesheet:
* {{{<?xml-stylesheet href="style.xsl" type="text/xml"?>}}}
@@ -41,7 +41,7 @@ namespace GXml {
* For more, see: [[http://www.w3.org/TR/DOM-Level-1/level-one-core.html#ID-1004215813]]
*/
public class ProcessingInstruction : xNode {
- internal ProcessingInstruction (string target, string data, Document doc) {
+ internal ProcessingInstruction (string target, string data, xDocument doc) {
base (NodeType.PROCESSING_INSTRUCTION, doc); // TODO: want to pass a real Xml.Node* ?
this.target = target;
this.data = data;
diff --git a/gxml/libxml-Text.vala b/gxml/libxml-Text.vala
index aafe232..35b76b9 100644
--- a/gxml/libxml-Text.vala
+++ b/gxml/libxml-Text.vala
@@ -2,7 +2,7 @@
/* Text.vala
*
* Copyright (C) 2011-2013 Richard Schwarting <aquarichy gmail com>
- * Copyright (C) 2011 Daniel Espinosa <esodan gmail com>
+ * Copyright (C) 2011,2015 Daniel Espinosa <esodan gmail com>
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -28,7 +28,7 @@ namespace GXml {
/**
* Text children of an element, not the tags or attributes.
*
- * To create one, use { link GXml.Document.create_text_node}.
+ * To create one, use { link GXml.xDocument.create_text_node}.
*
* Describes the text found as children of elements throughout
* an XML document, like "He who must not be named" in the
@@ -42,7 +42,7 @@ namespace GXml {
* URL: [[http://www.w3.org/TR/REC-DOM-Level-1/level-one-core.html#ID-1312295772]]
*/
public class Text : CharacterData {
- internal Text (Xml.Node *text_node, Document doc) {
+ internal Text (Xml.Node *text_node, xDocument doc) {
base (text_node, doc);
}
/**
diff --git a/test/AttrTest.vala b/test/AttrTest.vala
index 930cacd..20cfd19 100644
--- a/test/AttrTest.vala
+++ b/test/AttrTest.vala
@@ -28,7 +28,7 @@ using GXml;
class AttrTest : GXmlTest {
public static void add_tests () {
Test.add_func ("/gxml/element/namespace_uri", () => {
- Document doc = new Document.from_string ("<Wands
xmlns:wands=\"http://mom.co.uk/wands\";><Wand price=\"43.56\" wands:core=\"dragon heart cord\"
wands:shell=\"oak\"/></Wands>");
+ xDocument doc = new xDocument.from_string ("<Wands
xmlns:wands=\"http://mom.co.uk/wands\";><Wand price=\"43.56\" wands:core=\"dragon heart cord\"
wands:shell=\"oak\"/></Wands>");
GXml.xNode root = doc.document_element;
Element node = (Element)root.child_nodes.item (0);
@@ -41,7 +41,7 @@ class AttrTest : GXmlTest {
assert (price.namespace_uri == null);
});
Test.add_func ("/gxml/element/prefix", () => {
- Document doc = new Document.from_string ("<Wands
xmlns:wands=\"http://mom.co.uk/wands\";><Wand price=\"43.56\" wands:core=\"dragon heart cord\"
wands:shell=\"oak\"/></Wands>");
+ xDocument doc = new xDocument.from_string ("<Wands
xmlns:wands=\"http://mom.co.uk/wands\";><Wand price=\"43.56\" wands:core=\"dragon heart cord\"
wands:shell=\"oak\"/></Wands>");
GXml.xNode root = doc.document_element;
Element node = (Element)root.child_nodes.item (0);
@@ -54,7 +54,7 @@ class AttrTest : GXmlTest {
assert (price.prefix == null);
});
Test.add_func ("/gxml/element/local_name", () => {
- Document doc = new Document.from_string ("<Wands
xmlns:wands=\"http://mom.co.uk/wands\";><Wand price=\"43.56\" wands:core=\"dragon heart cord\"
wands:shell=\"oak\"/></Wands>");
+ xDocument doc = new xDocument.from_string ("<Wands
xmlns:wands=\"http://mom.co.uk/wands\";><Wand price=\"43.56\" wands:core=\"dragon heart cord\"
wands:shell=\"oak\"/></Wands>");
GXml.xNode root = doc.document_element;
Element node = (Element)root.child_nodes.item (0);
@@ -68,13 +68,13 @@ class AttrTest : GXmlTest {
});
Test.add_func ("/gxml/attribute/node_name", () => {
- Document doc = get_doc ();
+ xDocument doc = get_doc ();
Attr attr = get_attr ("broomSeries", "Nimbus", doc);
assert (attr.node_name == "broomSeries");
});
Test.add_func ("/gxml/attribute/node_value", () => {
- Document doc = get_doc ();
+ xDocument doc = get_doc ();
Attr attr = doc.create_attribute ("bank");
assert (attr.node_value == "");
@@ -87,13 +87,13 @@ class AttrTest : GXmlTest {
assert (attr.node_value == "Gringots");
});
Test.add_func ("/gxml/attribute/name", () => {
- Document doc = get_doc ();
+ xDocument doc = get_doc ();
Attr attr = get_attr ("broomSeries", "Nimbus", doc);
assert (attr.name == "broomSeries");
});
Test.add_func ("/gxml/attribute/node_value", () => {
- Document doc = get_doc ();
+ xDocument doc = get_doc ();
Attr attr = doc.create_attribute ("bank");
assert (attr.value == "");
@@ -109,7 +109,7 @@ class AttrTest : GXmlTest {
// TODO: involves supporting DTDs, which come later
});
Test.add_func ("/gxml/attribute/parent_node", () => {
- Document doc = get_doc ();
+ xDocument doc = get_doc ();
Element elem = get_elem ("creature", doc);
Attr attr = get_attr ("breed", "Dragons", doc);
@@ -118,7 +118,7 @@ class AttrTest : GXmlTest {
assert (attr.parent_node == null);
});
Test.add_func ("/gxml/attribute/previous_sibling", () => {
- Document doc = get_doc ();
+ xDocument doc = get_doc ();
Element elem = get_elem ("creature", doc);
Attr attr1 = get_attr ("breed", "Dragons", doc);
Attr attr2 = get_attr ("size", "large", doc);
@@ -130,7 +130,7 @@ class AttrTest : GXmlTest {
assert (attr2.previous_sibling == null);
});
Test.add_func ("/gxml/attribute/next_sibling", () => {
- Document doc = get_doc ();
+ xDocument doc = get_doc ();
Element elem = get_elem ("creature", doc);
Attr attr1 = get_attr ("breed", "Dragons", doc);
Attr attr2 = get_attr ("size", "large", doc);
@@ -142,7 +142,7 @@ class AttrTest : GXmlTest {
assert (attr2.next_sibling == null);
});
Test.add_func ("/gxml/attribute/insert_before", () => {
- Document doc = get_doc ();
+ xDocument doc = get_doc ();
Attr attr = get_attr ("pie", "Dumbleberry", doc);
Text txt = doc.create_text_node ("Whipped ");
@@ -153,7 +153,7 @@ class AttrTest : GXmlTest {
assert (attr.child_nodes.length == 1);
});
Test.add_func ("/gxml/attribute/replace_child", () => {
- Document doc = get_doc ();
+ xDocument doc = get_doc ();
Attr attr = get_attr ("WinningHouse", "Slytherin", doc);
Text txt = doc.create_text_node ("Gryffindor");
@@ -162,7 +162,7 @@ class AttrTest : GXmlTest {
assert (attr.value == "Gryffindor");
});
Test.add_func ("/gxml/attribute/remove_child", () => {
- Document doc = get_doc ();
+ xDocument doc = get_doc ();
Attr attr = get_attr ("parchment", "MauraudersMap", doc);
assert (attr.value == "MauraudersMap");
diff --git a/test/CharacterDataTest.vala b/test/CharacterDataTest.vala
index 899d740..2b07821 100644
--- a/test/CharacterDataTest.vala
+++ b/test/CharacterDataTest.vala
@@ -1,11 +1,34 @@
/* -*- Mode: vala; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/* CharacterDataTest.vala
+ *
+ * Copyright (C) 2011-2013 Richard Schwarting <aquarichy gmail com>
+ * Copyright (C) 2011-2015 Daniel Espinosa <esodan gmail com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Richard Schwarting <aquarichy gmail com>
+ * Daniel Espinosa <esodan gmail com>
+ */
+
using GXml;
class CharacterDataTest : GXmlTest {
public static void add_tests () {
Test.add_func ("/gxml/characterdata/data", () => {
string str = "It does not do to dwell on dreams and forget to live, remember
that.";
- Document doc;
+ xDocument doc;
Text txt = get_text_new_doc (str, out doc);
assert (txt.data == str);
@@ -13,13 +36,13 @@ class CharacterDataTest : GXmlTest {
});
Test.add_func ("/gxml/characterdata/length", () => {
string str = "After all, to the well-organized mind, death is but the next
great adventure.";
- Document doc;
+ xDocument doc;
Text txt = get_text_new_doc (str, out doc);
assert (txt.length == str.length);
});
Test.add_func ("/gxml/characterdata/substring_data", () => {
- Document doc;
+ xDocument 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);
@@ -30,7 +53,7 @@ class CharacterDataTest : GXmlTest {
Test.add_func ("/gxml/characterdata/append_data", () => {
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.";
- Document doc;
+ xDocument doc;
Text txt = get_text_new_doc ("Never trust anything that can think for
itself", out doc);
assert (txt.data == str_start);
@@ -38,7 +61,7 @@ class CharacterDataTest : GXmlTest {
assert (txt.data == str_whole);
});
Test.add_func ("/gxml/characterdata/insert_data", () => {
- Document doc;
+ xDocument 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.");
@@ -58,7 +81,7 @@ class CharacterDataTest : GXmlTest {
assert (txt.data == "Yes. It is our choices that show what we truly are, far
more than our abilities. Indeed.");
});
Test.add_func ("/gxml/characterdata/delete_data", () => {
- Document doc;
+ xDocument 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.");
@@ -67,7 +90,7 @@ class CharacterDataTest : GXmlTest {
Test.add_func ("/gxml/characterdata/replace_data", () => {
// TODO: test bounds
- Document doc;
+ xDocument 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.");
diff --git a/test/DocumentTest.vala b/test/DocumentTest.vala
index ec0e5cf..16b1eb5 100644
--- a/test/DocumentTest.vala
+++ b/test/DocumentTest.vala
@@ -29,8 +29,8 @@ class DocumentTest : GXmlTest {
Test.add_func ("/gxml/document/doctype", () => {
// STUB
/*
- Document doc = new Document.from_path ("/tmp/dtdtest2.xml");
- // Document doc = get_doc ();
+ xDocument doc = new xDocument.from_path ("/tmp/dtdtest2.xml");
+ // xDocument doc = get_doc ();
DocumentType type = doc.doctype;
HashTable<string,Entity> entities = type.entities;
assert_not_reached ();
@@ -39,7 +39,7 @@ class DocumentTest : GXmlTest {
*/
});
Test.add_func ("/gxml/document/implementation", () => {
- Document doc = get_doc ();
+ xDocument doc = get_doc ();
Implementation impl = doc.implementation;
@@ -50,7 +50,7 @@ class DocumentTest : GXmlTest {
assert (impl.has_feature ("nonsense") == false);
});
Test.add_func ("/gxml/document/document_element", () => {
- Document doc = get_doc ();
+ xDocument doc = get_doc ();
Element root = doc.document_element;
assert (root.node_name == "Sentences");
@@ -58,15 +58,15 @@ class DocumentTest : GXmlTest {
});
Test.add_func ("/gxml/document/construct_from_path", () => {
- Document doc = get_doc ();
+ xDocument doc = get_doc ();
check_contents (doc);
});
Test.add_func ("/gxml/document/construct_from_path_error", () => {
- Document doc;
+ xDocument doc;
try {
// file does not exist
- doc = new Document.from_path ("/tmp/asdfjlkansdlfjl");
+ doc = new xDocument.from_path ("/tmp/asdfjlkansdlfjl");
assert_not_reached ();
} catch (GXml.Error e) {
assert (e is GXml.Error.PARSER);
@@ -75,7 +75,7 @@ class DocumentTest : GXmlTest {
try {
// file exists, but is not XML (it's a directory!)
- doc = new Document.from_path ("/tmp/");
+ doc = new xDocument.from_path ("/tmp/");
assert_not_reached ();
} catch (GXml.Error e) {
assert (e is GXml.Error.PARSER);
@@ -83,7 +83,7 @@ class DocumentTest : GXmlTest {
test_error (DomException.INVALID_DOC);
try {
- doc = new Document.from_path ("test_invalid.xml");
+ doc = new xDocument.from_path ("test_invalid.xml");
assert_not_reached ();
} catch (GXml.Error e) {
assert (e is GXml.Error.PARSER);
@@ -93,14 +93,14 @@ class DocumentTest : GXmlTest {
Test.add_func ("/gxml/document/construct_from_stream", () => {
File fin;
InputStream instream;
- Document doc;
+ xDocument doc;
try {
fin = File.new_for_path (GXmlTest.get_test_dir () + "/test.xml");
instream = fin.read (null);
/* TODO: test GCancellable */
- doc = new Document.from_stream (instream);
+ doc = new xDocument.from_stream (instream);
check_contents (doc);
} catch (GLib.Error e) {
@@ -112,12 +112,12 @@ class DocumentTest : GXmlTest {
File fin;
InputStream instream;
FileIOStream iostream;
- Document doc;
+ xDocument doc;
try {
fin = File.new_tmp ("gxml.XXXXXX", out iostream);
instream = fin.read (null);
- doc = new Document.from_stream (instream);
+ doc = new xDocument.from_stream (instream);
assert_not_reached ();
} catch (GXml.Error e) {
assert (e is GXml.Error.PARSER);
@@ -129,11 +129,11 @@ class DocumentTest : GXmlTest {
});
Test.add_func ("/gxml/document/construct_from_string", () => {
string xml;
- Document doc;
+ xDocument doc;
GXml.xNode root;
xml = "<Fruits><Apple></Apple><Orange></Orange></Fruits>";
- doc = new Document.from_string (xml);
+ doc = new xDocument.from_string (xml);
root = doc.document_element;
assert (root.node_name == "Fruits");
@@ -142,7 +142,7 @@ class DocumentTest : GXmlTest {
assert (root.last_child.node_name == "Orange");
});
Test.add_func ("/gxml/document/save", () => {
- Document doc;
+ xDocument doc;
int exit_status;
try {
@@ -164,7 +164,7 @@ class DocumentTest : GXmlTest {
}
});
Test.add_func ("/gxml/document/save_error", () => {
- Document doc;
+ xDocument doc;
try {
doc = get_doc ();
@@ -182,7 +182,7 @@ class DocumentTest : GXmlTest {
File fout;
InputStream instream;
OutputStream outstream;
- Document doc;
+ xDocument doc;
int exit_status;
fin = File.new_for_path (GXmlTest.get_test_dir () + "/test.xml");
@@ -192,7 +192,7 @@ class DocumentTest : GXmlTest {
// OutputStream outstream = fout.create
(FileCreateFlags.REPLACE_DESTINATION, null); // REPLACE_DESTINATION doesn't work like I thought it would?
outstream = fout.replace (null, true,
FileCreateFlags.REPLACE_DESTINATION, null);
- doc = new Document.from_stream (instream);
+ doc = new xDocument.from_stream (instream);
doc.save_to_stream (outstream);
Process.spawn_sync (null,
@@ -212,7 +212,7 @@ class DocumentTest : GXmlTest {
File fout;
FileIOStream iostream;
OutputStream outstream;
- Document doc;
+ xDocument doc;
int exit_status;
doc = GXmlTest.get_doc ();
@@ -229,7 +229,7 @@ class DocumentTest : GXmlTest {
test_error (DomException.X_OTHER);
});
Test.add_func ("/gxml/document/create_element", () => {
- Document doc = get_doc ();
+ xDocument doc = get_doc ();
Element elem = null;
elem = doc.create_element ("Banana");
@@ -242,7 +242,7 @@ class DocumentTest : GXmlTest {
// assert (elem == null); // TODO: decide what we want returned on
DomExceptions
});
Test.add_func ("/gxml/document/create_document_fragment", () => {
- Document doc = get_doc ();
+ xDocument doc = get_doc ();
DocumentFragment fragment = doc.create_document_fragment ();
// TODO: can we set XML in the content, and actually have that translate into
real libxml2 underlying nodes?
@@ -313,28 +313,28 @@ class DocumentTest : GXmlTest {
assert (doc.to_string () == expected);
});
Test.add_func ("/gxml/document/create_text_node", () => {
- Document doc = get_doc ();
+ xDocument doc = get_doc ();
Text text = doc.create_text_node ("Star of my dreams");
assert (text.node_name == "#text");
assert (text.node_value == "Star of my dreams");
});
Test.add_func ("/gxml/document/create_comment", () => {
- Document doc = get_doc ();
+ xDocument doc = get_doc ();
Comment comment = doc.create_comment ("Ever since the day we promised.");
assert (comment.node_name == "#comment");
assert (comment.node_value == "Ever since the day we promised.");
});
Test.add_func ("/gxml/document/create_cdata_section", () => {
- Document doc = get_doc ();
+ xDocument doc = get_doc ();
CDATASection cdata = doc.create_cdata_section ("put in real cdata");
assert (cdata.node_name == "#cdata-section");
assert (cdata.node_value == "put in real cdata");
});
Test.add_func ("/gxml/document/create_processing_instruction", () => {
- Document doc = get_doc ();
+ xDocument doc = get_doc ();
ProcessingInstruction instruction = doc.create_processing_instruction
("target", "data");
assert (instruction.node_name == "target");
@@ -343,7 +343,7 @@ class DocumentTest : GXmlTest {
assert (instruction.node_value == "data");
});
Test.add_func ("/gxml/document/create_attribute", () => {
- Document doc = get_doc ();
+ xDocument doc = get_doc ();
Attr attr = doc.create_attribute ("attrname");
assert (attr.name == "attrname");
@@ -351,23 +351,23 @@ class DocumentTest : GXmlTest {
assert (attr.node_value == "");
});
Test.add_func ("/gxml/document/create_entity_reference", () => {
- Document doc = get_doc ();
+ xDocument doc = get_doc ();
EntityReference entity = doc.create_entity_reference ("entref");
assert (entity.node_name == "entref");
// TODO: think of at least one other smoke test
});
Test.add_func ("/gxml/document/get_elements_by_tag_name", () => {
- Document doc = get_doc ();
+ xDocument doc = get_doc ();
NodeList elems = doc.get_elements_by_tag_name ("Email");
assert (elems.length == 2);
assert (((Element)elems.item (0)).content == "fweasley hogwarts co uk");
/* more thorough test exists in Element, since right now
- Document uses that one */
+ xDocument uses that one */
});
Test.add_func ("/gxml/document/to_string", () => {
- Document doc = get_doc ();
+ xDocument doc = get_doc ();
assert (doc.to_string () == "<?xml version=\"1.0\"?>
<Sentences>
<Sentence lang=\"en\">I like the colour blue.</Sentence>
@@ -389,7 +389,7 @@ class DocumentTest : GXmlTest {
});
}
- private static void check_contents (Document test_doc) {
+ private static void check_contents (xDocument test_doc) {
Element root = test_doc.document_element;
assert (root.node_name == "Sentences");
diff --git a/test/ElementTest.vala b/test/ElementTest.vala
index e087683..6925718 100644
--- a/test/ElementTest.vala
+++ b/test/ElementTest.vala
@@ -26,7 +26,7 @@ using GXml;
// namespace GXml {
// public class TestElement : Element {
-// public TestElement (Xml.Node *node, Document doc) {
+// public TestElement (Xml.Node *node, xDocument doc) {
// /* /home2/richard/gxml/test/ElementTest.vala:7.4-7.19: error: chain up
// to `GXml.Element' not supported */
// base (node, doc);
@@ -54,7 +54,7 @@ class ElementTest : GXmlTest {
xmlnode->new_ns_prop (ns_course, "commonName", "Florax");
xmlroot->add_child (xmlnode);
- Document doc = new Document.from_libxml2 (xmldoc);
+ xDocument doc = new xDocument.from_libxml2 (xmldoc);
GXml.xNode root = doc.document_element;
GXml.xNode node = root.child_nodes.item (0);
@@ -68,7 +68,7 @@ class ElementTest : GXmlTest {
});
Test.add_func ("/gxml/element/namespace_uri", () => {
// TODO: wanted to use TestElement but CAN'T because Vala won't let me access
the internal constructor of Element?
- Document doc = new Document.from_string ("<Potions><magic:Potion
xmlns:magic=\"http://hogwarts.co.uk/magic\";
xmlns:products=\"http://diagonalley.co.uk/products\"/></Potions>");
+ xDocument doc = new xDocument.from_string ("<Potions><magic:Potion
xmlns:magic=\"http://hogwarts.co.uk/magic\";
xmlns:products=\"http://diagonalley.co.uk/products\"/></Potions>");
GXml.xNode root = doc.document_element;
GXml.xNode node = root.child_nodes.item (0);
@@ -76,7 +76,7 @@ class ElementTest : GXmlTest {
});
Test.add_func ("/gxml/element/testing", () => {
// TODO: wanted to use TestElement but CAN'T because Vala won't let me access
the internal constructor of Element?
- Document doc = new Document.from_string ("<Potions><magic:Potion
xmlns:magic=\"http://hogwarts.co.uk/magic\";
xmlns:products=\"http://diagonalley.co.uk/products\";><products:Ingredient /></magic:Potion></Potions>");
+ xDocument doc = new xDocument.from_string ("<Potions><magic:Potion
xmlns:magic=\"http://hogwarts.co.uk/magic\";
xmlns:products=\"http://diagonalley.co.uk/products\";><products:Ingredient /></magic:Potion></Potions>");
GXml.xNode root = doc.document_element;
GXml.xNode node = root.child_nodes.item (0);
@@ -93,21 +93,21 @@ class ElementTest : GXmlTest {
// }
});
Test.add_func ("/gxml/element/prefix", () => {
- Document doc = new Document.from_string ("<Potions><magic:Potion
xmlns:magic=\"http://hogwarts.co.uk/magic\";
xmlns:products=\"http://diagonalley.co.uk/products\"/></Potions>");
+ xDocument doc = new xDocument.from_string ("<Potions><magic:Potion
xmlns:magic=\"http://hogwarts.co.uk/magic\";
xmlns:products=\"http://diagonalley.co.uk/products\"/></Potions>");
GXml.xNode root = doc.document_element;
GXml.xNode node = root.child_nodes.item (0);
assert (node.prefix == "magic");
});
Test.add_func ("/gxml/element/local_name", () => {
- Document doc = new Document.from_string ("<Potions><magic:Potion
xmlns:magic=\"http://hogwarts.co.uk/magic\";
xmlns:products=\"http://diagonalley.co.uk/products\"/></Potions>");
+ xDocument doc = new xDocument.from_string ("<Potions><magic:Potion
xmlns:magic=\"http://hogwarts.co.uk/magic\";
xmlns:products=\"http://diagonalley.co.uk/products\"/></Potions>");
GXml.xNode root = doc.document_element;
GXml.xNode node = root.child_nodes.item (0);
assert (node.local_name == "Potion");
});
Test.add_func ("/gxml/element/namespace_definitions", () => {
- Document doc = new Document.from_string ("<Potions><magic:Potion
xmlns:magic=\"http://hogwarts.co.uk/magic\";
xmlns:products=\"http://diagonalley.co.uk/products\"/></Potions>");
+ xDocument doc = new xDocument.from_string ("<Potions><magic:Potion
xmlns:magic=\"http://hogwarts.co.uk/magic\";
xmlns:products=\"http://diagonalley.co.uk/products\"/></Potions>");
GXml.xNode root = doc.document_element;
GXml.xNode node = root.child_nodes.item (0);
@@ -126,7 +126,7 @@ class ElementTest : GXmlTest {
Test.add_func ("/gxml/element/attributes", () => {
NamedAttrMap attributes;
- Document doc;
+ xDocument doc;
Element elem;
doc = get_doc ();
@@ -166,7 +166,7 @@ class ElementTest : GXmlTest {
NamedAttrMap attrs;
string str;
- 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>");
+ xDocument doc = new xDocument.from_string ("<?xml version='1.0'
encoding='UTF-8'?><entry><link rel='http://schemas.google.com/contacts/2008/rel#photo'/></entry>");
GXml.xNode root = doc.document_element;
foreach (GXml.xNode child in root.child_nodes) {
attrs = child.attributes;
@@ -175,7 +175,7 @@ class ElementTest : GXmlTest {
str = doc.to_string ();
});
Test.add_func ("/gxml/element/get_set_attribute", () => {
- Document doc;
+ xDocument doc;
Element elem = get_elem_new_doc ("student", out doc);
assert ("" == elem.get_attribute ("name"));
@@ -186,7 +186,7 @@ class ElementTest : GXmlTest {
assert ("Lovegood" == elem.get_attribute ("name"));
});
Test.add_func ("/gxml/element/remove_attribute", () => {
- Document doc;
+ xDocument doc;
Element elem = get_elem_new_doc ("tagname", out doc);
elem.set_attribute ("name", "Malfoy");
@@ -199,7 +199,7 @@ class ElementTest : GXmlTest {
// Consider testing default attributes (see Attr and specified)
});
Test.add_func ("/gxml/element/get_attribute_node", () => {
- Document doc;
+ xDocument doc;
Element elem = get_elem_new_doc ("tagname", out doc);
assert (elem.get_attribute_node ("name") == null);
@@ -207,7 +207,7 @@ class ElementTest : GXmlTest {
assert (elem.get_attribute_node ("name").value == "Severus");
});
Test.add_func ("/gxml/element/set_attribute_node", () => {
- Document doc;
+ xDocument 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");
@@ -226,7 +226,7 @@ class ElementTest : GXmlTest {
Test.add_func ("/gxml/element/remove_attribute_node", () => {
- Document doc;
+ xDocument doc;
Element elem = get_elem_new_doc ("tagname", out doc);
Attr attr;
@@ -244,7 +244,7 @@ class ElementTest : GXmlTest {
Test.add_func ("/gxml/element/get_elements_by_tag_name", () => {
- Document doc;
+ xDocument doc;
GXml.xNode root;
Element elem;
NodeList emails;
@@ -293,7 +293,7 @@ class ElementTest : GXmlTest {
remove a tree with 2, list has 5
readd the tree, list has 7
*/
- Document doc;
+ xDocument doc;
string xml;
xml =
@@ -311,7 +311,7 @@ class ElementTest : GXmlTest {
</Bs>
<Cs><C><t /></C></Cs>
</A>";
- doc = new Document.from_string (xml);
+ doc = new xDocument.from_string (xml);
GXml.xNode a = doc.document_element;
GXml.xNode bs = a.child_nodes.item (3);
@@ -383,14 +383,14 @@ class ElementTest : GXmlTest {
assert (ts.length == 11);
});
Test.add_func ("/gxml/element/normalize", () => {
- Document doc;
+ xDocument doc;
Element elem = get_elem_new_doc ("tagname", out doc);
elem.normalize ();
// STUB
});
Test.add_func ("/gxml/element/to_string", () =>{
- Document doc, doc2;
+ xDocument doc, doc2;
Element elem = get_elem_new_doc ("country", out doc);
elem.append_child (elem.owner_document.create_text_node ("New Zealand"));
if (elem.to_string () != "<country>New Zealand</country>") {
@@ -410,7 +410,7 @@ class ElementTest : GXmlTest {
// TODO: want to test with format on and off
});
Test.add_func ("/gxml/element/content/set", () =>{
- var doc = new Document ();
+ var doc = new xDocument ();
var root = doc.create_element ("root");
doc.append_child (root);
root.content = "TEXT1";
@@ -423,7 +423,7 @@ class ElementTest : GXmlTest {
}
});
Test.add_func ("/gxml/element/content/overwrite_child_nodes", () =>{
- var doc = new Document ();
+ var doc = new xDocument ();
var root = doc.create_element ("root");
doc.append_child (root);
var n = doc.create_element ("child");
@@ -439,7 +439,7 @@ class ElementTest : GXmlTest {
}
});
Test.add_func ("/gxml/element/content/keep_child_nodes", () =>{
- var doc = new Document ();
+ var doc = new xDocument ();
var root = doc.create_element ("root");
doc.append_child (root);
var n = doc.create_element ("child");
diff --git a/test/EnumerationTest.vala b/test/EnumerationTest.vala
index 4b689e4..f9bb211 100644
--- a/test/EnumerationTest.vala
+++ b/test/EnumerationTest.vala
@@ -8,7 +8,7 @@
* Daniel Espinosa <esodan gmail com>
*
*
- * Copyright (c) 2013-2014 Daniel Espinosa
+ * Copyright (c) 2013-2015 Daniel Espinosa
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -107,7 +107,7 @@ class SerializableEnumerationTest : GXmlTest
});
Test.add_func ("/gxml/serializable/enumeration-serialize",
() => {
- var doc = new Document ();
+ var doc = new xDocument ();
var options = new Options ();
options.options = OptionsEnum.NORMAL_OPERATION;
try {
@@ -131,7 +131,7 @@ class SerializableEnumerationTest : GXmlTest
assert_not_reached ();
}
options.options = (OptionsEnum) (-1); // invaliding this property. Avoids serialize
it.
- var doc2 = new Document ();
+ var doc2 = new xDocument ();
options.serialize (doc2);
var opts = doc2.document_element.get_attribute_node ("options");
if (opts != null) {
@@ -148,49 +148,49 @@ class SerializableEnumerationTest : GXmlTest
() => {
var options = new Options ();
try {
- var doc = new Document.from_string ("""<?xml version="1.0"?>
+ var doc = new xDocument.from_string ("""<?xml version="1.0"?>
<options options="NormalOperation"/>""");
options.deserialize (doc);
if (options.options != OptionsEnum.NORMAL_OPERATION) {
stdout.printf (@"ERROR: Bad value to options property: $(options.options)\n$(doc)");
assert_not_reached ();
}
- var doc2 = new Document.from_string ("""<?xml version="1.0"?>
+ var doc2 = new xDocument.from_string ("""<?xml version="1.0"?>
<options options="normal-operation"/>""");
options.deserialize (doc2);
if (options.options != OptionsEnum.NORMAL_OPERATION) {
stdout.printf (@"ERROR: Bad value to options property:
$(options.options)\n$(doc2)");
assert_not_reached ();
}
- var doc3 = new Document.from_string ("""<?xml version="1.0"?>
+ var doc3 = new xDocument.from_string ("""<?xml version="1.0"?>
<options options="selectbefore"/>""");
options.deserialize (doc3);
if (options.options != OptionsEnum.SelectBefore) {
stdout.printf (@"ERROR: Bad value to options property:
$(options.options)\n$(doc3)");
assert_not_reached ();
}
- var doc4 = new Document.from_string ("""<?xml version="1.0"?>
+ var doc4 = new xDocument.from_string ("""<?xml version="1.0"?>
<options options="OPTIONS_ENUM_SelectBefore"/>""");
options.deserialize (doc4);
if (options.options != OptionsEnum.SelectBefore) {
stdout.printf (@"ERROR: Bad value to options property:
$(options.options)\n$(doc4)");
assert_not_reached ();
}
- var doc5 = new Document.from_string ("""<?xml version="1.0"?>
+ var doc5 = new xDocument.from_string ("""<?xml version="1.0"?>
<options options="SelectBefore"/>""");
options.deserialize (doc5);
if (options.options != OptionsEnum.SelectBefore) {
stdout.printf (@"ERROR: Bad value to options property:
$(options.options)\n$(doc5)");
assert_not_reached ();
}
- var doc6 = new Document.from_string ("""<?xml version="1.0"?>
+ var doc6 = new xDocument.from_string ("""<?xml version="1.0"?>
<options options="SELECTBEFORE"/>""");
options.deserialize (doc6);
if (options.options != OptionsEnum.SelectBefore) {
stdout.printf (@"ERROR: Bad value to options property:
$(options.options)\n$(doc6)");
assert_not_reached ();
}
- var doc7 = new Document.from_string ("""<?xml version="1.0"?>
+ var doc7 = new xDocument.from_string ("""<?xml version="1.0"?>
<options options="NORMAL_OPERATION"/>""");
options.deserialize (doc7);
if (options.options != OptionsEnum.SelectBefore) {
@@ -198,7 +198,7 @@ class SerializableEnumerationTest : GXmlTest
assert_not_reached ();
}
var op2 = new Options ();
- var doc8 = new Document.from_string ("""<?xml version="1.0"?>
+ var doc8 = new xDocument.from_string ("""<?xml version="1.0"?>
<options options="INVALID"/>""");
op2.deserialize (doc8);
if (op2.options != OptionsEnum.SelectBefore) {
@@ -212,4 +212,4 @@ class SerializableEnumerationTest : GXmlTest
}
});
}
-}
\ No newline at end of file
+}
diff --git a/test/GXmlTest.vala b/test/GXmlTest.vala
index c4382b0..13045c4 100644
--- a/test/GXmlTest.vala
+++ b/test/GXmlTest.vala
@@ -1,4 +1,26 @@
/* -*- Mode: vala; indent-tabs-mode: t; c-basic-offset: 2; tab-width: 2 -*- */
+/* GXmlTest.vala
+ *
+ * Copyright (C) 2011-2013 Richard Schwarting <aquarichy gmail com>
+ * Copyright (C) 2011-2015 Daniel Espinosa <esodan gmail com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Richard Schwarting <aquarichy gmail com>
+ * Daniel Espinosa <esodan gmail com>
+ */
using GXml;
class GXmlTest {
@@ -53,10 +75,10 @@ class GXmlTest {
return 0;
}
- internal static Document get_doc (string? path = null) {
- Document doc = null;
+ internal static xDocument get_doc (string? path = null) {
+ xDocument doc = null;
try {
- doc = new Document.from_path (path != null ? path :
+ doc = new xDocument.from_path (path != null ? path :
get_test_dir () + "/test.xml");
} catch (GXml.Error e) {
GLib.warning (e.message);
@@ -65,7 +87,7 @@ class GXmlTest {
return doc;
}
- internal static Document get_doc_with_ns () {
+ internal static xDocument get_doc_with_ns () {
return get_doc (get_test_dir () + "/test_with_ns.xml");
}
@@ -81,26 +103,26 @@ class GXmlTest {
// return get_attr (name, value, get_doc ());
// }
- internal static Attr get_attr (string name, string value, Document doc) {
+ internal static Attr get_attr (string name, string value, xDocument doc) {
Attr attr = doc.create_attribute (name);
attr.value = value;
return attr;
}
- internal static Element get_elem_new_doc (string name, out Document doc) {
+ internal static Element get_elem_new_doc (string name, out xDocument doc) {
return get_elem (name, doc = get_doc ());
}
- internal static Element get_elem (string name, Document doc) {
+ internal static Element get_elem (string name, xDocument doc) {
Element elem = doc.create_element (name);
return elem;
}
- internal static Text get_text_new_doc (string data, out Document doc) {
+ internal static Text get_text_new_doc (string data, out xDocument doc) {
return get_text (data, doc = get_doc ());
}
- internal static Text get_text (string data, Document doc) {
+ internal static Text get_text (string data, xDocument doc) {
Text txt = doc.create_text_node (data);
return txt;
}
diff --git a/test/NamespaceTest.vala b/test/NamespaceTest.vala
index 6258be1..3a8f9f0 100644
--- a/test/NamespaceTest.vala
+++ b/test/NamespaceTest.vala
@@ -1,6 +1,23 @@
-/**
- * Copyright 2015, Daniel Espinosa <esodan gmail com>
+/* -*- Mode: vala; indent-tabs-mode: t; c-basic-offset: 2; tab-width: 2 -*- */
+/* NamespaceTest.vala
*
+ * Copyright (C) 2015 Daniel Espinosa <esodan gmail com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Daniel Espinosa <esodan gmail com>
*/
using GXml;
@@ -9,7 +26,7 @@ class NamespaceTest : GXmlTest {
public static void add_tests () {
Test.add_func ("/gxml/domnode/namespace", () => {
- var d = new Document ();
+ var d = new xDocument ();
var e = d.create_element ("root");
e.add_namespace_attr ("http://www.gnome.org/GXml";, "gxml");
e.add_namespace_attr ("http://www.gnome.org/GXmlSerializable";, "gxmls");
diff --git a/test/NodeTest.vala b/test/NodeTest.vala
index 4dd8b81..ea5a034 100644
--- a/test/NodeTest.vala
+++ b/test/NodeTest.vala
@@ -1,4 +1,4 @@
-/* -*- Mode: vala; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/* -*- Mode: vala; indent-tabs-mode: t; c-basic-offset: 2; tab-width: 2 -*- */
/* Notation.vala
*
* Copyright (C) 2011-2013 Richard Schwarting <aquarichy gmail com>
@@ -36,7 +36,7 @@ class NodeTest : GXmlTest {
public static void add_tests () {
Test.add_func ("/gxml/domnode/node_name_get", () => {
// TODO: should Nodes never have a null name?
- Document doc = get_doc ();
+ xDocument doc = get_doc ();
GXml.xNode node;
node = get_elem ("elemname", doc);
@@ -77,7 +77,7 @@ class NodeTest : GXmlTest {
Test.add_func ("/gxml/domnode/node_type_get", () => {
// TODO: implement commented-out types
- Document doc = get_doc ();
+ xDocument doc = get_doc ();
GXml.xNode node;
node = get_elem ("a", doc);
@@ -120,7 +120,7 @@ class NodeTest : GXmlTest {
/* See: http://www.w3.org/TR/DOM-Level-1/level-one-core.html */
- Document doc = get_doc ();
+ xDocument doc = get_doc ();
GXml.xNode node;
@@ -150,7 +150,7 @@ class NodeTest : GXmlTest {
assert (doc.node_value == null);
- /* TODO: Document Type, Document Fragment, Notation */
+ /* TODO: xDocument Type, xDocument Fragment, Notation */
// assert (attr.node_value == "harry");
/* TODO: figure out a solution.
Attr's node_value doesn't get used when elem is thought of
@@ -159,7 +159,7 @@ class NodeTest : GXmlTest {
while Attr wants to get it from Attr's Xml.Attr* node. :( */
});
Test.add_func ("/gxml/domnode/parent_node", () => {
- Document doc = get_doc ();
+ xDocument doc = get_doc ();
GXml.xNode parent = get_elem ("James", doc);
GXml.xNode child = get_elem ("Harry", doc);
@@ -173,7 +173,7 @@ class NodeTest : GXmlTest {
// assert (document fragment's parent_node == null); // TODO
});
Test.add_func ("/gxml/domnode/child_nodes", () => {
- Document doc = get_doc ();
+ xDocument doc = get_doc ();
GXml.xNode parent = get_elem ("Molly", doc);
if (parent == null) {
stdout.printf (@"Parent child Molly not created\n");
@@ -222,7 +222,7 @@ class NodeTest : GXmlTest {
}
});
Test.add_func ("/gxml/domnode/first_child", () => {
- Document doc = get_doc ();
+ xDocument doc = get_doc ();
GXml.xNode parent = get_elem ("Molly", doc);
GXml.xNode child_0 = get_elem ("Percy", doc);
GXml.xNode child_1 = get_elem ("Ron", doc);
@@ -236,7 +236,7 @@ class NodeTest : GXmlTest {
assert (parent.first_child == child_0);
});
Test.add_func ("/gxml/domnode/last_child", () => {
- Document doc = get_doc ();
+ xDocument doc = get_doc ();
GXml.xNode parent = get_elem ("Molly", doc);
GXml.xNode child_0 = get_elem ("Percy", doc);
GXml.xNode child_1 = get_elem ("Ron", doc);
@@ -250,7 +250,7 @@ class NodeTest : GXmlTest {
assert (parent.last_child == child_2);
});
Test.add_func ("/gxml/domnode/previous_sibling", () => {
- Document doc = get_doc ();
+ xDocument doc = get_doc ();
GXml.xNode parent = get_elem ("Molly", doc);
GXml.xNode child_0 = get_elem ("Percy", doc);
GXml.xNode child_1 = get_elem ("Ron", doc);
@@ -266,7 +266,7 @@ class NodeTest : GXmlTest {
assert (child_2.previous_sibling == child_1);
});
Test.add_func ("/gxml/domnode/next_sibling", () => {
- Document doc = get_doc ();
+ xDocument doc = get_doc ();
GXml.xNode parent = get_elem ("Molly", doc);
GXml.xNode child_0 = get_elem ("Percy", doc);
GXml.xNode child_1 = get_elem ("Ron", doc);
@@ -282,7 +282,7 @@ class NodeTest : GXmlTest {
assert (child_2.next_sibling == null);
});
Test.add_func ("/gxml/domnode/attributes", () => {
- Document doc = get_doc ();
+ xDocument doc = get_doc ();
GXml.xNode elem = get_elem ("Hogwarts", doc);
GXml.xNode attr = get_attr ("Potter", "Lily", doc);
@@ -293,15 +293,15 @@ class NodeTest : GXmlTest {
// TODO: test compatibility between live changes and stuff
});
Test.add_func ("/gxml/domnode/owner_document", () => {
- Document doc2 = get_doc ();
- Document doc1 = get_doc ();
+ xDocument doc2 = get_doc ();
+ xDocument doc1 = get_doc ();
GXml.xNode elem = get_elem ("Malfoy", doc1);
assert (elem.owner_document == doc1);
assert (elem.owner_document != doc2);
});
Test.add_func ("/gxml/domnode/insert_before", () => {
- Document doc = get_doc ();
+ xDocument doc = get_doc ();
GXml.xNode parent = get_elem ("Molly", doc);
GXml.xNode child_0 = get_elem ("Percy", doc);
GXml.xNode child_1 = get_elem ("Ron", doc);
@@ -328,7 +328,7 @@ class NodeTest : GXmlTest {
Test.add_func ("/gxml/domnode/replace_child", () => {
// TODO: for this one, and others that include a ref_child, we want to test
passing an irrelevant ref child and a null ref child
- Document doc = get_doc ();
+ xDocument doc = get_doc ();
GXml.xNode parent = get_elem ("Molly", doc);
GXml.xNode child_0 = get_elem ("Percy", doc);
GXml.xNode child_1 = get_elem ("Ron", doc);
@@ -351,7 +351,7 @@ class NodeTest : GXmlTest {
assert (child_1.next_sibling == null);
});
Test.add_func ("/gxml/domnode/remove_child", () => {
- Document doc = get_doc ();
+ xDocument doc = get_doc ();
GXml.xNode parent = get_elem ("Molly", doc);
GXml.xNode child_0 = get_elem ("Percy", doc);
GXml.xNode child_1 = get_elem ("Ron", doc);
@@ -393,7 +393,7 @@ class NodeTest : GXmlTest {
assert (parent.child_nodes.length == 0);
});
Test.add_func ("/gxml/domnode/append_child", () => {
- Document doc = get_doc ();
+ xDocument doc = get_doc ();
GXml.xNode parent = get_elem ("Molly", doc);
GXml.xNode child_0 = get_elem ("Percy", doc);
GXml.xNode child_1 = get_elem ("Ron", doc);
@@ -418,7 +418,7 @@ class NodeTest : GXmlTest {
assert (child_2.next_sibling == null);
});
Test.add_func ("/gxml/domnode/has_child_nodes", () => {
- Document doc = get_doc ();
+ xDocument doc = get_doc ();
GXml.xNode parent = get_elem ("Molly", doc);
GXml.xNode child_0 = get_elem ("Percy", doc);
diff --git a/test/SerializableBasicTypesTest.vala b/test/SerializableBasicTypesTest.vala
index 11adf17..1a3e2dd 100644
--- a/test/SerializableBasicTypesTest.vala
+++ b/test/SerializableBasicTypesTest.vala
@@ -8,7 +8,7 @@
* Daniel Espinosa <esodan gmail com>
*
*
- * Copyright (c) 2013-2014 Daniel Espinosa
+ * Copyright (c) 2013-2015 Daniel Espinosa
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU Lesser General Public License as published by
@@ -40,7 +40,7 @@ class SerializableBasicTypeTest : GXmlTest {
try {
var bt = new BasicType ();
bt.boolean = true;
- var doc = new Document ();
+ var doc = new xDocument ();
bt.serialize (doc);
var element = doc.document_element;
var b = element.get_attribute_node ("boolean");
@@ -63,7 +63,7 @@ class SerializableBasicTypeTest : GXmlTest {
try {
var bt = new BasicType ();
bt.boolean = true;
- var doc = new Document.from_string ("""<?xml version="1.0"?>
+ var doc = new xDocument.from_string ("""<?xml version="1.0"?>
<basictype boolean="true"/>""");
bt.deserialize (doc);
if (bt.boolean != true) {
@@ -81,31 +81,31 @@ class SerializableBasicTypeTest : GXmlTest {
try {
var bt = new BasicType ();
bt.boolean = true;
- var doc = new Document.from_string ("""<?xml version="1.0"?>
+ var doc = new xDocument.from_string ("""<?xml version="1.0"?>
<basictype integer="156"/>""");
bt.deserialize (doc);
assert (bt.integer == 156);
- var doc1 = new Document.from_string ("""<?xml version="1.0"?>
+ var doc1 = new xDocument.from_string ("""<?xml version="1.0"?>
<basictype integer="a156"/>""");
bt.deserialize (doc1);
assert (bt.integer == 0);
- var doc2 = new Document.from_string ("""<?xml version="1.0"?>
+ var doc2 = new xDocument.from_string ("""<?xml version="1.0"?>
<basictype integer="156b"/>""");
bt.deserialize (doc2);
assert (bt.integer == 156);
- var doc3 = new Document.from_string ("""<?xml version="1.0"?>
+ var doc3 = new xDocument.from_string ("""<?xml version="1.0"?>
<basictype integer="156.0"/>""");
bt.deserialize (doc3);
assert (bt.integer == 156);
- var doc4 = new Document.from_string ("""<?xml version="1.0"?>
+ var doc4 = new xDocument.from_string ("""<?xml version="1.0"?>
<basictype integer="0.156"/>""");
bt.deserialize (doc4);
assert (bt.integer == 0);
- var doc5 = new Document.from_string ("""<?xml version="1.0"?>
+ var doc5 = new xDocument.from_string ("""<?xml version="1.0"?>
<basictype integer="a156.156"/>""");
bt.deserialize (doc5);
assert (bt.integer == 0);
- var doc6 = new Document.from_string ("""<?xml version="1.0"?>
+ var doc6 = new xDocument.from_string ("""<?xml version="1.0"?>
<basictype integer="156.156b"/>""");
bt.deserialize (doc6);
assert (bt.integer == 156);
@@ -119,35 +119,35 @@ class SerializableBasicTypeTest : GXmlTest {
try {
var bt = new BasicType ();
bt.boolean = true;
- var doc = new Document.from_string ("""<?xml version="1.0"?>
+ var doc = new xDocument.from_string ("""<?xml version="1.0"?>
<basictype floatval="156"/>""");
bt.deserialize (doc);
assert (bt.floatval == 156.0);
- var doc1 = new Document.from_string ("""<?xml version="1.0"?>
+ var doc1 = new xDocument.from_string ("""<?xml version="1.0"?>
<basictype floatval="a156"/>""");
bt.deserialize (doc1);
assert (bt.floatval == 0.0);
- var doc2 = new Document.from_string ("""<?xml version="1.0"?>
+ var doc2 = new xDocument.from_string ("""<?xml version="1.0"?>
<basictype floatval="156b"/>""");
bt.deserialize (doc2);
assert (bt.floatval == 156.0);
- var doc3 = new Document.from_string ("""<?xml version="1.0"?>
+ var doc3 = new xDocument.from_string ("""<?xml version="1.0"?>
<basictype floatval="156.0"/>""");
bt.deserialize (doc3);
assert (bt.floatval == 156.0);
- var doc4 = new Document.from_string ("""<?xml version="1.0"?>
+ var doc4 = new xDocument.from_string ("""<?xml version="1.0"?>
<basictype floatval="0.156"/>""");
bt.deserialize (doc4);
assert (bt.floatval == (float) 0.156);
- var doc5 = new Document.from_string ("""<?xml version="1.0"?>
+ var doc5 = new xDocument.from_string ("""<?xml version="1.0"?>
<basictype floatval="a156.156"/>""");
bt.deserialize (doc5);
assert (bt.floatval == 0.0);
- var doc6 = new Document.from_string ("""<?xml version="1.0"?>
+ var doc6 = new xDocument.from_string ("""<?xml version="1.0"?>
<basictype floatval="156.156b"/>""");
bt.deserialize (doc6);
assert (bt.floatval == (float) 156.156);
- var doc7 = new Document.from_string ("""<?xml version="1.0"?>
+ var doc7 = new xDocument.from_string ("""<?xml version="1.0"?>
<basictype boolean="true"/>""");
bt.floatval = (float) 0.0;
bt.deserialize (doc7);
@@ -162,35 +162,35 @@ class SerializableBasicTypeTest : GXmlTest {
try {
var bt = new BasicType ();
bt.boolean = true;
- var doc = new Document.from_string ("""<?xml version="1.0"?>
+ var doc = new xDocument.from_string ("""<?xml version="1.0"?>
<basictype doubleval="156"/>""");
bt.deserialize (doc);
assert (bt.doubleval == 156.0);
- var doc1 = new Document.from_string ("""<?xml version="1.0"?>
+ var doc1 = new xDocument.from_string ("""<?xml version="1.0"?>
<basictype doubleval="a156"/>""");
bt.deserialize (doc1);
assert (bt.doubleval == 0.0);
- var doc2 = new Document.from_string ("""<?xml version="1.0"?>
+ var doc2 = new xDocument.from_string ("""<?xml version="1.0"?>
<basictype doubleval="156b"/>""");
bt.deserialize (doc2);
assert (bt.doubleval == 156.0);
- var doc3 = new Document.from_string ("""<?xml version="1.0"?>
+ var doc3 = new xDocument.from_string ("""<?xml version="1.0"?>
<basictype doubleval="156.0"/>""");
bt.deserialize (doc3);
assert (bt.doubleval == 156.0);
- var doc4 = new Document.from_string ("""<?xml version="1.0"?>
+ var doc4 = new xDocument.from_string ("""<?xml version="1.0"?>
<basictype doubleval="0.156"/>""");
bt.deserialize (doc4);
assert (bt.doubleval == 0.156);
- var doc5 = new Document.from_string ("""<?xml version="1.0"?>
+ var doc5 = new xDocument.from_string ("""<?xml version="1.0"?>
<basictype doubleval="a156.156"/>""");
bt.deserialize (doc5);
assert (bt.doubleval == 0.0);
- var doc6 = new Document.from_string ("""<?xml version="1.0"?>
+ var doc6 = new xDocument.from_string ("""<?xml version="1.0"?>
<basictype doubleval="156.156b"/>""");
bt.deserialize (doc6);
assert (bt.doubleval == 156.156);
- var doc7 = new Document.from_string ("""<?xml version="1.0"?>
+ var doc7 = new xDocument.from_string ("""<?xml version="1.0"?>
<basictype boolean="true"/>""");
bt.doubleval = 0.0;
bt.deserialize (doc7);
diff --git a/test/SerializableGeeArrayListTest.vala b/test/SerializableGeeArrayListTest.vala
index deca85c..3d7617d 100644
--- a/test/SerializableGeeArrayListTest.vala
+++ b/test/SerializableGeeArrayListTest.vala
@@ -72,7 +72,7 @@ class SerializableGeeArrayListTest : GXmlTest
var o2 = new AElement.named ("Small");
c.add (o1);
c.add (o2);
- var doc = new Document ();
+ var doc = new xDocument ();
var root = doc.create_element ("root");
doc.append_child (root);
c.serialize (root);
@@ -108,7 +108,7 @@ class SerializableGeeArrayListTest : GXmlTest
Test.add_func ("/gxml/serializable/serializable_array_list/deserialize",
() => {
try {
- var doc = new Document.from_string ("""<?xml version="1.0"?>
+ var doc = new xDocument.from_string ("""<?xml version="1.0"?>
<root><aelement name="Big"/><aelement name="Small"/></root>""");
var c = new SerializableArrayList<AElement> ();
c.deserialize (doc.document_element);
@@ -139,7 +139,7 @@ class SerializableGeeArrayListTest : GXmlTest
Test.add_func ("/gxml/serializable/serializable_array_list/deserialize-serialize",
() => {
try {
- var idoc = new Document.from_string ("""<?xml version="1.0"?>
+ var idoc = new xDocument.from_string ("""<?xml version="1.0"?>
<root>
<aelement name="Big"/>
<aelement name="Small"/>
@@ -148,7 +148,7 @@ class SerializableGeeArrayListTest : GXmlTest
var iroot = idoc.document_element;
var ic = new SerializableArrayList<AElement> ();
ic.deserialize (iroot);
- var doc = new Document.from_string ("""<?xml version="1.0"?><root />""");
+ var doc = new xDocument.from_string ("""<?xml version="1.0"?><root />""");
var root = doc.document_element;
ic.serialize (root);
var c = new SerializableArrayList<AElement> ();
diff --git a/test/SerializableGeeCollectionsTest.vala b/test/SerializableGeeCollectionsTest.vala
index da07b73..2ea55b9 100644
--- a/test/SerializableGeeCollectionsTest.vala
+++ b/test/SerializableGeeCollectionsTest.vala
@@ -184,7 +184,7 @@ class SerializableGeeCollectionsTest : GXmlTest
Test.add_func ("/gxml/serializable/convined_gee_containers/deserialize",
() => {
try {
- var doc = new Document.from_string ("""<?xml version="1.0"?>
+ var doc = new xDocument.from_string ("""<?xml version="1.0"?>
<base name="AlphaOne" >
<chargezone name="A1-1">
<ship manufacturer="MacToy" model="A1234">
@@ -287,7 +287,7 @@ class SerializableGeeCollectionsTest : GXmlTest
Test.add_func ("/gxml/serializable/convined_gee_containers/de-se-deserialize",
() => {
try {
- var doc = new Document.from_string ("""<?xml version="1.0"?>
+ var doc = new xDocument.from_string ("""<?xml version="1.0"?>
<base name="AlphaOne" >
<chargezone name="A1-1">
<ship manufacturer="MacToy" model="A1234">
@@ -351,7 +351,7 @@ class SerializableGeeCollectionsTest : GXmlTest
assert_not_reached ();
}
// Check First serialize
- var ndoc = new Document ();
+ var ndoc = new xDocument ();
s.serialize (ndoc);
var ns = new SpaceBase ();
ns.deserialize (ndoc);
@@ -411,7 +411,7 @@ class SerializableGeeCollectionsTest : GXmlTest
Test.add_func ("/gxml/serializable/convined_gee_containers/se-deserialize-unknowns",
() => {
try {
- var org_doc = new Document.from_string ("""<?xml version="1.0"?>
+ var org_doc = new xDocument.from_string ("""<?xml version="1.0"?>
<base name="AlphaOne" >
<chargezone name="A1-1">
<ship manufacturer="MacToy" model="A1234">
@@ -500,7 +500,7 @@ class SerializableGeeCollectionsTest : GXmlTest
}
assert_not_reached ();
}
- var doc = new Document ();
+ var doc = new xDocument ();
s.serialize (doc);
if (doc.document_element.node_name != "base") {
stdout.printf (@"ERROR: bad root node name\n");
diff --git a/test/SerializableGeeDualKeyMapTest.vala b/test/SerializableGeeDualKeyMapTest.vala
index 8e9621c..dcb7a0d 100644
--- a/test/SerializableGeeDualKeyMapTest.vala
+++ b/test/SerializableGeeDualKeyMapTest.vala
@@ -142,7 +142,7 @@ class SerializableGeeDualKeyMapTest : GXmlTest
c.set (o2.owner, o2.name, o2);
c.set (o3.owner, o3.name, o3);
c.set (o4.owner, o4.name, o4);
- var doc = new Document ();
+ var doc = new xDocument ();
var root = doc.create_element ("root");
doc.append_child (root);
c.serialize (root);
@@ -204,7 +204,7 @@ class SerializableGeeDualKeyMapTest : GXmlTest
Test.add_func ("/gxml/serializable/serializable_dual_key_map/deserialize",
() => {
try {
- var doc = new Document.from_string ("""<?xml version="1.0"?>
+ var doc = new xDocument.from_string ("""<?xml version="1.0"?>
<root><spaces name="Small" owner="Wall"/><spaces name="Smallest" owner="Wall"/><spaces name="Big"
owner="Floor"/><spaces name="Bigger" owner="Floor"/><spark /></root>""");
var c = new SerializableDualKeyMap<string,string,Spaces> ();
c.deserialize (doc.document_element);
@@ -247,7 +247,7 @@ class SerializableGeeDualKeyMapTest : GXmlTest
Test.add_func ("/gxml/serializable/serializable_dual_key_map/de-se-deserialize",
() => {
try {
- var idoc = new Document.from_string ("""<?xml version="1.0"?>
+ var idoc = new xDocument.from_string ("""<?xml version="1.0"?>
<root><spaces name="Small" owner="Wall"/><spaces name="Smallest" owner="Wall"/><spaces name="Big"
owner="Floor"/><spaces name="Bigger" owner="Floor"/><spark /></root>""");
var ic = new SerializableDualKeyMap<string,string,Spaces> ();
ic.deserialize (idoc.document_element);
@@ -255,7 +255,7 @@ class SerializableGeeDualKeyMapTest : GXmlTest
stdout.printf (@"ERROR: Incorrect size (1st deserialize). Expected 4, got: $(ic.size)\n$idoc\n");
assert_not_reached ();
}
- var doc = new Document.from_string ("""<?xml version="1.0"?>
+ var doc = new xDocument.from_string ("""<?xml version="1.0"?>
<root />""");
ic.serialize (doc.document_element);
var c = new SerializableDualKeyMap<string,string,Spaces> ();
diff --git a/test/SerializableGeeHashMapTest.vala b/test/SerializableGeeHashMapTest.vala
index 9ed7748..c435b8f 100644
--- a/test/SerializableGeeHashMapTest.vala
+++ b/test/SerializableGeeHashMapTest.vala
@@ -111,7 +111,7 @@ class SerializableGeeHashMapTest : GXmlTest
o2.set_value ("FAKE TEXT");
c.set (o1.name, o1);
c.set (o2.name, o2);
- var doc = new Document ();
+ var doc = new xDocument ();
var root = doc.create_element ("root");
doc.append_child (root);
c.serialize (root);
@@ -157,7 +157,7 @@ class SerializableGeeHashMapTest : GXmlTest
Test.add_func ("/gxml/serializable/serializable_hash_map/deserialize",
() => {
try {
- var doc = new Document.from_string ("""<?xml version="1.0"?>
+ var doc = new xDocument.from_string ("""<?xml version="1.0"?>
<root><space name="Big"/><space name="Small"/></root>""");
var c = new SerializableHashMap<string,Space> ();
c.deserialize (doc.document_element);
@@ -188,7 +188,7 @@ class SerializableGeeHashMapTest : GXmlTest
Test.add_func ("/gxml/serializable/serializable_hash_map/container_class/deserialize",
() => {
try {
- var doc = new Document.from_string ("""<?xml version="1.0"?>
+ var doc = new xDocument.from_string ("""<?xml version="1.0"?>
<spacecontainer owner="Earth"><space name="Big"/><space name="Small"/></spacecontainer>""");
var c = new SpaceContainer ();
c.deserialize (doc);
@@ -229,7 +229,7 @@ class SerializableGeeHashMapTest : GXmlTest
c.storage = new Space.Collection ();
c.storage.set (o1.name, o1);
c.storage.set (o2.name, o2);
- var doc = new Document ();
+ var doc = new xDocument ();
c.serialize (doc);
if (doc.document_element == null) {
stdout.printf (@"ERROR: doc have no root node\n$(doc)\n");
@@ -272,7 +272,7 @@ class SerializableGeeHashMapTest : GXmlTest
Test.add_func ("/gxml/serializable/serializable_hash_map/deserialize-serialize",
() => {
try {
- var idoc = new Document.from_string ("""<?xml version="1.0"?>
+ var idoc = new xDocument.from_string ("""<?xml version="1.0"?>
<spacecontainer owner="Earth">
<space name="Big"/>
<space name="Big">FAKE1</space>
@@ -284,7 +284,7 @@ class SerializableGeeHashMapTest : GXmlTest
</spacecontainer>""");
var isc = new SpaceContainer ();
isc.deserialize (idoc);
- var doc = new Document ();
+ var doc = new xDocument ();
isc.serialize (doc);
var sc = new SpaceContainer ();
sc.deserialize (doc);
diff --git a/test/SerializableGeeTreeMapTest.vala b/test/SerializableGeeTreeMapTest.vala
index 5930fff..42ce702 100644
--- a/test/SerializableGeeTreeMapTest.vala
+++ b/test/SerializableGeeTreeMapTest.vala
@@ -101,7 +101,7 @@ class SerializableGeeTreeMapTest : GXmlTest
var o2 = new Space.named ("Small");
c.set (o1.name, o1);
c.set (o2.name, o2);
- var doc = new Document ();
+ var doc = new xDocument ();
var root = doc.create_element ("root");
doc.append_child (root);
c.serialize (root);
@@ -137,7 +137,7 @@ class SerializableGeeTreeMapTest : GXmlTest
Test.add_func ("/gxml/serializable/serializable_tree_map/deserialize",
() => {
try {
- var doc = new Document.from_string ("""<?xml version="1.0"?>
+ var doc = new xDocument.from_string ("""<?xml version="1.0"?>
<root><space name="Big"/><space name="Small"/></root>""");
var c = new SerializableTreeMap<string,Space> ();
c.deserialize (doc.document_element);
@@ -168,7 +168,7 @@ class SerializableGeeTreeMapTest : GXmlTest
Test.add_func ("/gxml/serializable/serializable_tree_map/container_class/deserialize",
() => {
try {
- var doc = new Document.from_string ("""<?xml version="1.0"?>
+ var doc = new xDocument.from_string ("""<?xml version="1.0"?>
<spacecontainer owner="Earth"><space name="Big"/><space name="Small"/></spacecontainer>""");
var c = new SpaceContainer ();
c.deserialize (doc);
@@ -213,7 +213,7 @@ class SerializableGeeTreeMapTest : GXmlTest
c.storage = new Space.Collection ();
c.storage.set (o1.name, o1);
c.storage.set (o2.name, o2);
- var doc = new Document ();
+ var doc = new xDocument ();
c.serialize (doc);
if (doc.document_element == null) {
stdout.printf (@"ERROR: doc have no root node\n$(doc)\n");
diff --git a/test/SerializableObjectModelTest.vala b/test/SerializableObjectModelTest.vala
index 6275ed4..ac7c21c 100644
--- a/test/SerializableObjectModelTest.vala
+++ b/test/SerializableObjectModelTest.vala
@@ -247,8 +247,8 @@ class Configuration : ObjectModel
{
//stdout.printf (@"CONFIGURATOR: Namespaces Check");
GXml.xNode n;
- if (node is Document)
- n = (GXml.xNode) (((GXml.Document) node).document_element);
+ if (node is xDocument)
+ n = (GXml.xNode) (((GXml.xDocument) node).document_element);
else
n = node;
@@ -295,7 +295,7 @@ class SerializableObjectModelTest : GXmlTest
() => {
try {
var computer = new Computer ();
- var doc = new Document ();
+ var doc = new xDocument ();
computer.serialize (doc);
if (doc.document_element.tag_name.down () != "computer") {
stdout.printf ("ERROR XML_COMPUTER: computer\n");
@@ -337,7 +337,7 @@ class SerializableObjectModelTest : GXmlTest
() => {
var computer = new Computer ();
try {
- var doc = new Document.from_string (XML_COMPUTER_FILE);
+ var doc = new xDocument.from_string (XML_COMPUTER_FILE);
computer.deserialize (doc);
if (computer.manufacturer != "ThecnicalGroup") {
stdout.printf (@"ERROR XML_COMPUTER: manufacturer val: $(computer.manufacturer)\n");
@@ -366,7 +366,7 @@ class SerializableObjectModelTest : GXmlTest
() => {
var manual = new Manual ();
try {
- var doc = new Document.from_string ("""<?xml version="1.0"?>
+ var doc = new xDocument.from_string ("""<?xml version="1.0"?>
<manual document="Specification" pages="3">This is an Specification file</manual>""");
manual.deserialize (doc);
if (manual.document != "Specification") {
@@ -390,7 +390,7 @@ class SerializableObjectModelTest : GXmlTest
);
Test.add_func ("/gxml/serializable/object_model/serialize_object_contents",
() => {
- var doc = new Document ();
+ var doc = new xDocument ();
var manual = new Manual ();
try {
manual.serialize (doc);
@@ -410,7 +410,7 @@ class SerializableObjectModelTest : GXmlTest
() => {
var package = new Package ();
try {
- var doc = new Document.from_string (XML_PACKAGE_FILE);
+ var doc = new xDocument.from_string (XML_PACKAGE_FILE);
package.deserialize (doc);
if (package.source != "Mexico/Central") {
stdout.printf (@"ERROR PACKAGE: source: $(package.source)\n");
@@ -461,7 +461,7 @@ class SerializableObjectModelTest : GXmlTest
);
Test.add_func ("/gxml/serializable/object_model/serialize_serializable_properties",
() => {
- var doc = new Document ();
+ var doc = new xDocument ();
var package = new Package ();
try {
package.serialize (doc);
@@ -491,7 +491,7 @@ class SerializableObjectModelTest : GXmlTest
);
Test.add_func ("/gxml/serializable/object_model/deserialize_array_property",
() => {
- var doc = new Document.from_string (XML_PACKAGE_FILE);
+ var doc = new xDocument.from_string (XML_PACKAGE_FILE);
var package = new Package ();
try {
package.deserialize (doc);
@@ -520,7 +520,7 @@ class SerializableObjectModelTest : GXmlTest
);
Test.add_func ("/gxml/serializable/object_model/serialize_array_property",
() => {
- var doc = new Document ();
+ var doc = new xDocument ();
var package = new Package ();
package.tags.append_val ("Computer");
package.tags.append_val ("Customer");
@@ -567,7 +567,7 @@ class SerializableObjectModelTest : GXmlTest
);
Test.add_func ("/gxml/serializable/object_model/serialize_property_nick",
() => {
- var doc = new Document ();
+ var doc = new xDocument ();
var monitor = new Monitor ();
try {
monitor.resolution = "1204x720";
@@ -625,7 +625,7 @@ class SerializableObjectModelTest : GXmlTest
cpu.piles.add (1);
cpu.piles.add (2);
cpu.piles.add (3);
- var doc = new Document ();
+ var doc = new xDocument ();
try {
cpu.serialize (doc);
//stdout.printf (@"$doc");
@@ -664,7 +664,7 @@ class SerializableObjectModelTest : GXmlTest
Test.add_func ("/gxml/serializable/object_model/override_transform_from_string",
() => {
var cpu = new Cpu ();
- var doc = new Document.from_string (XML_CPU_FILE);
+ var doc = new xDocument.from_string (XML_CPU_FILE);
try {
cpu.deserialize (doc);
//stdout.printf (@"$doc");
@@ -696,7 +696,7 @@ class SerializableObjectModelTest : GXmlTest
});
Test.add_func ("/gxml/serializable/object_model/override_serialize",
() => {
- var doc = new Document ();
+ var doc = new xDocument ();
var configuration = new Configuration ();
configuration.device = "Controller";
try {
@@ -732,7 +732,7 @@ class SerializableObjectModelTest : GXmlTest
});
Test.add_func ("/gxml/serializable/object_model/override_deserialize",
() => {
- var doc = new Document.from_string ("""<?xml version="1.0"?>
+ var doc = new xDocument.from_string ("""<?xml version="1.0"?>
<Configuration xmlns:om="http://www.gnome.org/gxml/0.4"; device="Sampler"/>""");
var configuration = new Configuration ();
try {
@@ -753,7 +753,7 @@ class SerializableObjectModelTest : GXmlTest
});
Test.add_func ("/gxml/serializable/object_model/custome_node_name",
() => {
- var doc = new Document.from_string ("""<?xml version="1.0"?><NodeName />""");
+ var doc = new xDocument.from_string ("""<?xml version="1.0"?><NodeName />""");
var nodename = new NodeName ();
try {
nodename.deserialize (doc);
@@ -765,7 +765,7 @@ class SerializableObjectModelTest : GXmlTest
});
Test.add_func ("/gxml/serializable/object_model/no_serialize_null_property",
() => {
- var doc = new Document();
+ var doc = new xDocument();
var unknown_property = new UnknownAttribute (); // name is set to null
try {
unknown_property.serialize (doc);
@@ -792,7 +792,7 @@ class SerializableObjectModelTest : GXmlTest
});
Test.add_func ("/gxml/serializable/object_model/unknown_property",
() => {
- var doc = new Document.from_string ("""<?xml version="1.0"?>
+ var doc = new xDocument.from_string ("""<?xml version="1.0"?>
<UnknownAttribute ignore="true" ignore2="test">
<UnknownNode toignore = "true" />TEXT
</UnknownAttribute>""");
@@ -843,7 +843,7 @@ class SerializableObjectModelTest : GXmlTest
});
Test.add_func ("/gxml/serializable/object_model/deserialize_unknown_property",
() => {
- var doc = new Document.from_string ("""<?xml version="1.0"?>
+ var doc = new xDocument.from_string ("""<?xml version="1.0"?>
<UnknownAttribute ignore="true" ignore2="test">
<UnknownNode direction = "fordward">
<UnknownChild t = "test">
@@ -857,7 +857,7 @@ class SerializableObjectModelTest : GXmlTest
var unknown_property = new UnknownAttribute ();
try {
unknown_property.deserialize (doc);
- var doc2 = new Document ();
+ var doc2 = new xDocument ();
unknown_property.serialize (doc2);
if (doc2.document_element == null) {
stdout.printf (@"ERROR: UNKNOWN_ATTRIBUTE: SERIALIZATION: No Root Element");
@@ -913,7 +913,7 @@ class SerializableObjectModelTest : GXmlTest
stdout.printf (@"ERROR: UNKNOWN_ATTRIBUTE: SERIALIZATION: UnknownNode No not
found");
assert_not_reached ();
}
- // TODO: serialized_xml_node_value have more text than expected, may be a bug in
Document.to_string ()
+ // TODO: serialized_xml_node_value have more text than expected, may be a bug in
xDocument.to_string ()
if (unknown_property.serialized_xml_node_value == "FAKE TEXT") {
stdout.printf (@"ERROR: UNKNOWN_ATTRIBUTE: SERIALIZATION: Bad UnknownAttribute
node's content text $(unknown_property.serialized_xml_node_value)");
assert_not_reached ();
@@ -927,13 +927,13 @@ class SerializableObjectModelTest : GXmlTest
Test.add_func ("/gxml/serializable/object_model/serialize_unknown_property",
() => {
try {
- var doc = new Document.from_string ("""<?xml version="1.0"?>
+ var doc = new xDocument.from_string ("""<?xml version="1.0"?>
<UnknownAttribute ignore="true" ignore2="test">
<UnknownNode toignore = "true" />TEXT
</UnknownAttribute>""");
var unknown_property = new UnknownAttribute ();
unknown_property.deserialize (doc);
- var ndoc = new Document ();
+ var ndoc = new xDocument ();
unknown_property.serialize (ndoc);
if (ndoc.document_element.child_nodes.size != 2) {
stdout.printf (@"ERROR: Root incorrect child node number: found
'$(doc.document_element.child_nodes.size)\n");
@@ -962,7 +962,7 @@ class SerializableObjectModelTest : GXmlTest
Test.add_func ("/gxml/serializable/object_model/deserialize_incorrect_uint",
() => {
try {
- var doc = new Document.from_string (
+ var doc = new xDocument.from_string (
"""<?xml version="1.0"?>
<PACKAGE source="Mexico/North" destiny="Brazil" Hope="2/4.04">
<manual document="Sales Card" pages="1">Selling Card Specification</manual>
@@ -973,14 +973,24 @@ class SerializableObjectModelTest : GXmlTest
var pkg = new Package ();
pkg.deserialize (doc);
}
- catch (GXml.SerializableError e) { Test.message ("Error thrown for invalid string to
guint"); }
+ catch (GLib.Error e) {
+ Test.message ("Error thrown for invalid string to guint");
+ assert_not_reached ();
+ }
});
Test.add_func ("/gxml/serializable/object_model/set_namespace", () => {
- var ns = new NameSpace ();
- var doc = new Document ();
- ns.serialize (doc);
- assert (doc.document_element.to_string () == "<gxml:namespace
xmlns:gxml=\"http://www.gnome.org/GXml\"/>");
+ try {
+ var ns = new NameSpace ();
+ var doc = new xDocument ();
+ ns.serialize (doc);
+ assert (doc.document_element.to_string () == "<gxml:namespace
xmlns:gxml=\"http://www.gnome.org/GXml\"/>");
+ } catch (GLib.Error e) {
+#if DEBUG
+ GLib.message ("ERROR: "+e.message);
+#endif
+ assert_not_reached ();
+ }
});
}
static void serialize_manual_check (Element element, Manual manual)
diff --git a/test/SerializableTest.vala b/test/SerializableTest.vala
index cea32b1..456ea9c 100644
--- a/test/SerializableTest.vala
+++ b/test/SerializableTest.vala
@@ -1,7 +1,7 @@
-/* -*- Mode: vala; indent-tabs-mode: nil; c-basic-offset: 2; tab-width: 2 -*- */
+/* -*- Mode: vala; indent-tabs-mode: t; c-basic-offset: 2; tab-width: 2 -*- */
/**
*
- * GXml.Serializable.BasicTypeTest
+ * GXml.Serializable.SerializableTest
*
* Authors:
*
@@ -122,7 +122,7 @@ public class SerializableCapsicum : GXml.SerializableJson {
}
private void serialize_unknown_property_type (GXml.xNode element, ParamSpec prop, out GXml.xNode node)
{
- Document doc = element.owner_document;
+ xDocument doc = element.owner_document;
switch (prop.name) {
case "ratings":
foreach (int rating_int in ratings) {
@@ -228,8 +228,9 @@ public class SerializableBanana : GXml.SerializableJson {
class SerializableTest : GXmlTest {
public static void add_tests () {
Test.add_func ("/gxml/serializable/interface_defaults", () => {
+ try {
SerializableTomato tomato = new SerializableTomato (0, 0, 12, "cats");
- var doc = new Document ();
+ var doc = new xDocument ();
tomato.serialize (doc);
SerializableTomato tomato2 = new SerializableTomato (1,1,4,"dogs");
tomato2.deserialize (doc);
@@ -237,9 +238,15 @@ class SerializableTest : GXmlTest {
assert (tomato2.weight == 1);
assert (tomato.height == tomato2.height);
assert (tomato.description == tomato2.description);
+ } catch (GLib.Error e) {
+#if DEBUG
+ GLib.message ("ERROR: "+e.message);
+#endif
+ assert_not_reached ();
+ }
});
Test.add_func ("/gxml/serializable/interface_override_serialization_on_list", () => {
- GXml.Document doc;
+ GXml.xDocument doc;
SerializableCapsicum capsicum;
SerializableCapsicum capsicum_new;
string expectation;
@@ -256,7 +263,7 @@ class SerializableTest : GXmlTest {
capsicum = new SerializableCapsicum (2, 3, 6, ratings);
try {
- doc = new Document ();
+ doc = new xDocument ();
capsicum.serialize (doc);
} catch (GLib.Error e) {
GLib.message ("%s", e.message);
diff --git a/test/SerializationTest.vala b/test/SerializationTest.vala
index 89b04c3..013dd38 100644
--- a/test/SerializationTest.vala
+++ b/test/SerializationTest.vala
@@ -1,5 +1,5 @@
-/* -*- Mode: vala; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
-/* Notation.vala
+/* -*- Mode: vala; indent-tabs-mode: t; c-basic-offset: 2; tab-width: 2 -*- */
+/* SerializationTest.vala
*
* Copyright (C) 2011-2013 Richard Schwarting <aquarichy gmail com>
* Copyright (C) 2011-2015 Daniel Espinosa <esodan gmail com>
@@ -280,8 +280,8 @@ class SerializationTest : GXmlTest {
StringifyFunc stringify)
{
string xml_filename;
- GXml.Document sdoc;
- GXml.Document doc;
+ GXml.xDocument sdoc;
+ GXml.xDocument doc;
GLib.Object object_new = null;
// make sure we have a fresh cache without collisions from previous tests
@@ -294,7 +294,7 @@ class SerializationTest : GXmlTest {
// TODO: assert that node is right
sdoc.save_to_path (xml_filename);
// TODO: assert that saved file is right
- doc = new GXml.Document.from_path (xml_filename);
+ doc = new GXml.xDocument.from_path (xml_filename);
// TODO: assert that loaded file is right; do document compare with original
object_new = Serialization.deserialize_object (object.get_type (), doc);
@@ -356,11 +356,11 @@ class SerializationTest : GXmlTest {
});
Test.add_func ("/gxml/serialization/xml_deserialize", () => {
- Document doc;
+ xDocument doc;
Fruit fruit;
try {
- doc = new Document.from_string ("<Object otype='Fruit'><Property
pname='age' ptype='gint'>3</Property></Object>");
+ doc = new xDocument.from_string ("<Object otype='Fruit'><Property
pname='age' ptype='gint'>3</Property></Object>");
fruit = (Fruit)Serialization.deserialize_object (typeof (Fruit), doc);
// we expect 9 because Fruit triples it in the setter
@@ -374,12 +374,12 @@ class SerializationTest : GXmlTest {
}
});
Test.add_func ("/gxml/serialization/xml_deserialize_no_type", () => {
- Document doc;
+ xDocument doc;
Fruit fruit;
/* Right now we can infer the type from a property's name, but fields we
might need to specify */
try {
- doc = new Document.from_string ("<Object otype='Fruit'><Property
pname='age'>3</Property></Object>");
+ doc = new xDocument.from_string ("<Object otype='Fruit'><Property
pname='age'>3</Property></Object>");
fruit = (Fruit)Serialization.deserialize_object (typeof (Fruit), doc);
} catch (GLib.Error e) {
Test.message ("%s", e.message);
@@ -387,10 +387,10 @@ class SerializationTest : GXmlTest {
}
});
Test.add_func ("/gxml/serialization/xml_deserialize_bad_property_name", () => {
- Document doc;
+ xDocument doc;
try {
- doc = new Document.from_string ("<Object otype='Fruit'><Property
name='badname'>3</Property></Object>");
+ doc = new xDocument.from_string ("<Object otype='Fruit'><Property
name='badname'>3</Property></Object>");
Serialization.deserialize_object (typeof (Fruit), doc);
Test.message ("Expected SerializationError.UNKNOWN_PROPERTY to be
thrown for property 'badname' in object 'Fruit' :( Did not happen.");
assert_not_reached ();
@@ -405,10 +405,10 @@ class SerializationTest : GXmlTest {
}
});
Test.add_func ("/gxml/serialization/xml_deserialize_bad_object_type", () => {
- Document doc;
+ xDocument doc;
try {
- doc = new Document.from_string ("<Object otype='BadType'></Object>");
+ doc = new xDocument.from_string ("<Object otype='BadType'></Object>");
Serialization.deserialize_object (0, doc);
assert_not_reached ();
} catch (GLib.Error e) {
@@ -422,14 +422,14 @@ class SerializationTest : GXmlTest {
}
});
Test.add_func ("/gxml/serialization/xml_deserialize_unknown_property_type", () => {
- Document doc;
+ xDocument doc;
Fruit fruit;
// Clear cache to avoid collisions with other tests
Serialization.clear_cache ();
try {
- doc = new Document.from_string ("<Object otype='Fruit'><Property
pname='unknown' ptype='badtype'>blue</Property></Object>");
+ doc = new xDocument.from_string ("<Object otype='Fruit'><Property
pname='unknown' ptype='badtype'>blue</Property></Object>");
fruit = (Fruit)Serialization.deserialize_object (typeof (Fruit), doc);
assert_not_reached ();
} catch (GLib.Error e) {
@@ -463,7 +463,7 @@ class SerializationTest : GXmlTest {
SimpleProperties simple_properties;
ComplexDuplicateProperties obj;
ComplexDuplicateProperties restored;
- GXml.Document xml;
+ GXml.xDocument xml;
// Clear cache to avoid collisions with other tests
Serialization.clear_cache ();
@@ -625,14 +625,14 @@ class SerializationTest : GXmlTest {
/* TODO: expecting this one to fail right now,
because we probably still don't support fields,
just properties. */
- Document doc;
+ xDocument doc;
Fruit fruit;
// Clear cache to avoid collisions with other tests
Serialization.clear_cache ();
try {
- doc = new Document.from_string ("<Object
otype='Fruit'><Property pname='colour' ptype='gchararray'>blue</Property><Property pname='weight'
ptype='gint'>11</Property><Property pname='name' ptype='gchararray'>fish</Property><Property pname='age'
ptype='gint'>3</Property></Object>");
+ doc = new xDocument.from_string ("<Object
otype='Fruit'><Property pname='colour' ptype='gchararray'>blue</Property><Property pname='weight'
ptype='gint'>11</Property><Property pname='name' ptype='gchararray'>fish</Property><Property pname='age'
ptype='gint'>3</Property></Object>");
fruit = (Fruit)Serialization.deserialize_object (typeof
(Fruit), doc);
if (! fruit.test ("blue", 11, "fish", 3)) {
diff --git a/test/TextTest.vala b/test/TextTest.vala
index c16fdab..89e0af3 100644
--- a/test/TextTest.vala
+++ b/test/TextTest.vala
@@ -1,4 +1,26 @@
-/* -*- Mode: vala; indent-tabs-mode: t; c-basic-offset: 8; tab-width: 8 -*- */
+/* -*- Mode: vala; indent-tabs-mode: t; c-basic-offset: 2; tab-width: 2 -*- */
+/* GXmlTest.vala
+ *
+ * Copyright (C) 2011-2013 Richard Schwarting <aquarichy gmail com>
+ * Copyright (C) 2011-2015 Daniel Espinosa <esodan gmail com>
+ *
+ * This library is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU Lesser General Public
+ * License as published by the Free Software Foundation; either
+ * version 2.1 of the License, or (at your option) any later version.
+
+ * This library is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this library; if not, see <http://www.gnu.org/licenses/>.
+ *
+ * Authors:
+ * Richard Schwarting <aquarichy gmail com>
+ * Daniel Espinosa <esodan gmail com>
+ */
using GXml;
class TextTest : GXmlTest {
@@ -6,7 +28,7 @@ class TextTest : GXmlTest {
/* NOTE: GXml.Node name and node value behaviour tested by NodeTest */
Test.add_func ("/gxml/text/split_text", () => {
- Document doc;
+ xDocument doc;
Text txt1 = get_text_new_doc ("Constant vigilance!", out doc);
Text txt2 = txt1.split_text (5);
diff --git a/test/gxml-performance.vala b/test/gxml-performance.vala
index c43ec5d..d239278 100644
--- a/test/gxml-performance.vala
+++ b/test/gxml-performance.vala
@@ -79,7 +79,7 @@ public class Performance
() => {
Test.timer_start ();
double time;
- var d = new Document.from_path (GXmlTest.get_test_dir () + "/test-large.xml");
+ var d = new xDocument.from_path (GXmlTest.get_test_dir () + "/test-large.xml");
time = Test.timer_elapsed ();
Test.minimized_result (time, "Load large document: %g seconds", time);
Test.timer_start ();
@@ -93,7 +93,7 @@ public class Performance
() => {
double time;
Test.timer_start ();
- var d = new Document.from_path (GXmlTest.get_test_dir () + "/test-large.xml");
+ var d = new xDocument.from_path (GXmlTest.get_test_dir () + "/test-large.xml");
time = Test.timer_elapsed ();
Test.minimized_result (time, "open document from path: %g seconds", time);
Test.timer_start ();
@@ -107,7 +107,7 @@ public class Performance
() => {
double time;
Test.timer_start ();
- var d = new Document.from_path (GXmlTest.get_test_dir () + "/test-large.xml");
+ var d = new xDocument.from_path (GXmlTest.get_test_dir () + "/test-large.xml");
time = Test.timer_elapsed ();
Test.minimized_result (time, "open document from path: %g seconds", time);
Test.timer_start ();
@@ -116,7 +116,7 @@ public class Performance
time = Test.timer_elapsed ();
Test.minimized_result (time, "deserialize/performance: %g seconds", time);
Test.timer_start ();
- var d2 = new Document ();
+ var d2 = new xDocument ();
bs.serialize (d2);
time = Test.timer_elapsed ();
Test.minimized_result (time, "serialize/performance: %g seconds", time);
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
