[gxml] TwNode and derived renamed to TNode
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gxml] TwNode and derived renamed to TNode
- Date: Wed, 9 Mar 2016 19:11:53 +0000 (UTC)
commit 2a5d8347f15c9f69905c963cde3d3c413242b542
Author: Daniel Espinosa <esodan gmail com>
Date: Mon Mar 7 21:32:08 2016 -0600
TwNode and derived renamed to TNode
NEWS | 7 +++
gxml/GXmlDocument.vala | 6 +-
gxml/Makefile.am | 18 ++++----
gxml/{TwAttribute.vala => TAttribute.vala} | 8 ++--
gxml/{TwCDATA.vala => TCDATA.vala} | 8 ++--
gxml/{TwComment.vala => TComment.vala} | 8 ++--
gxml/{TwDocument.vala => TDocument.vala} | 24 +++++-----
gxml/{TwElement.vala => TElement.vala} | 16 ++++----
gxml/{TwNamespace.vala => TNamespace.vala} | 10 ++--
gxml/{TwNode.vala => TNode.vala} | 20 ++++----
...nstruction.vala => TProcessingInstruction.vala} | 8 ++--
gxml/{TwText.vala => TText.vala} | 10 ++--
gxml/{TwComment.vala => TrDocument.vala} | 28 ++----------
test/GXmlTest.vala | 14 +++---
test/Makefile.am | 14 +++---
test/SerializableGeeArrayListTest.vala | 4 +-
...SerializableGeeCollections-TDocument-Test.vala} | 10 ++--
test/SerializableGeeCollectionsTest.vala | 4 +-
test/SerializableGeeDualKeyMapTest.vala | 2 +-
test/SerializableGeeHashMapTest.vala | 6 +-
test/SerializableGeeTreeMapTest.vala | 4 +-
...=> SerializableObjectModel-TDocument-Test.vala} | 26 ++++++------
test/{TwCDATATest.vala => TCDATATest.vala} | 6 +-
test/{TwCommentTest.vala => TCommentTest.vala} | 6 +-
test/{TwDocumentTest.vala => TDocumentTest.vala} | 44 ++++++++++----------
test/{TwElementTest.vala => TElementTest.vala} | 36 ++++++++--------
...onTest.vala => TProcessingInstructionTest.vala} | 6 +-
27 files changed, 171 insertions(+), 182 deletions(-)
---
diff --git a/NEWS b/NEWS
index 85e684c..1f87887 100644
--- a/NEWS
+++ b/NEWS
@@ -1,4 +1,11 @@
===============
+Version 0.9.3
+===============
+
+* API change TwNode and derived classes renamed to TNode
+
+
+===============
Version 0.9.2
===============
diff --git a/gxml/GXmlDocument.vala b/gxml/GXmlDocument.vala
index c9cdbb7..c276fea 100644
--- a/gxml/GXmlDocument.vala
+++ b/gxml/GXmlDocument.vala
@@ -152,11 +152,11 @@ public class GXml.GDocument : GXml.GNode, GXml.Document
public override string to_string ()
{
#if DEBUG
- GLib.message ("TwDocument: to_string ()");
+ GLib.message ("TDocument: to_string ()");
#endif
Xml.Doc doc = new Xml.Doc ();
Xml.TextWriter tw = Xmlx.new_text_writer_doc (ref doc);
- TwDocument.write_document (this, tw);
+ TDocument.write_document (this, tw);
string str;
int size;
doc.dump_memory (out str, out size);
@@ -178,6 +178,6 @@ public class GXml.GDocument : GXml.GNode, GXml.Document
public virtual bool save_as (GLib.File f, GLib.Cancellable? cancellable = null)
throws GLib.Error
{
- return TwDocument.tw_save_as (this, f, cancellable);
+ return TDocument.tw_save_as (this, f, cancellable);
}
}
diff --git a/gxml/Makefile.am b/gxml/Makefile.am
index 04dfa40..74513cf 100644
--- a/gxml/Makefile.am
+++ b/gxml/Makefile.am
@@ -72,15 +72,15 @@ sources = \
SerializableMapDualKey.vala \
SerializableGeeArrayList.vala \
SerializableContainer.vala \
- TwAttribute.vala \
- TwComment.vala \
- TwCDATA.vala \
- TwDocument.vala \
- TwElement.vala \
- TwNamespace.vala \
- TwNode.vala \
- TwProcessingInstruction.vala \
- TwText.vala \
+ TAttribute.vala \
+ TComment.vala \
+ TCDATA.vala \
+ TDocument.vala \
+ TElement.vala \
+ TNamespace.vala \
+ TNode.vala \
+ TProcessingInstruction.vala \
+ TText.vala \
GHtml.vala \
GXmlAttribute.vala \
GXmlComment.vala \
diff --git a/gxml/TwAttribute.vala b/gxml/TAttribute.vala
similarity index 89%
rename from gxml/TwAttribute.vala
rename to gxml/TAttribute.vala
index d6131a9..fa33812 100644
--- a/gxml/TwAttribute.vala
+++ b/gxml/TAttribute.vala
@@ -1,4 +1,4 @@
-/* TwAttribute.vala
+/* TAttribute.vala
*
* Copyright (C) 2015-2016 Daniel Espinosa <esodan gmail com>
*
@@ -24,11 +24,11 @@ using Gee;
/**
* Class implemeting { link GXml.Attribute} interface, not tied to libxml-2.0 library.
*/
-public class GXml.TwAttribute : GXml.TwNode, GXml.Attribute
+public class GXml.TAttribute : GXml.TNode, GXml.Attribute
{
protected Gee.ArrayList<GXml.Node> _namespaces;
- public TwAttribute (GXml.Document d, string name, string value)
- requires (d is TwDocument)
+ public TAttribute (GXml.Document d, string name, string value)
+ requires (d is TDocument)
{
_doc = d;
_name = name;
diff --git a/gxml/TwCDATA.vala b/gxml/TCDATA.vala
similarity index 88%
rename from gxml/TwCDATA.vala
rename to gxml/TCDATA.vala
index 053e38e..33b230e 100644
--- a/gxml/TwCDATA.vala
+++ b/gxml/TCDATA.vala
@@ -1,4 +1,4 @@
-/* TwCDATA.vala
+/* TCDATA.vala
*
* Copyright (C) 2015 Daniel Espinosa <esodan gmail com>
*
@@ -24,14 +24,14 @@ using Gee;
/**
* Class implemeting { link GXml.CDATA} interface, not tied to libxml-2.0 library.
*/
-public class GXml.TwCDATA : GXml.TwNode, GXml.CDATA
+public class GXml.TCDATA : GXml.TNode, GXml.CDATA
{
private string _str = null;
construct {
_name = "#cdata";
}
- public TwCDATA (GXml.Document d, string text)
- requires (d is GXml.TwDocument)
+ public TCDATA (GXml.Document d, string text)
+ requires (d is GXml.TDocument)
{
_doc = d;
_str = text;
diff --git a/gxml/TwComment.vala b/gxml/TComment.vala
similarity index 88%
copy from gxml/TwComment.vala
copy to gxml/TComment.vala
index c053e60..cadda77 100644
--- a/gxml/TwComment.vala
+++ b/gxml/TComment.vala
@@ -1,4 +1,4 @@
-/* Element.vala
+/* TComment.vala
*
* Copyright (C) 2015 Daniel Espinosa <esodan gmail com>
*
@@ -24,14 +24,14 @@ using Gee;
/**
* Class implemeting { link GXml.Comment} interface, not tied to libxml-2.0 library.
*/
-public class GXml.TwComment : GXml.TwNode, GXml.Comment
+public class GXml.TComment : GXml.TNode, GXml.Comment
{
private string _str = "";
construct {
_name = "#comment";
}
- public TwComment (GXml.Document doc, string text)
- requires (doc is GXml.TwDocument)
+ public TComment (GXml.Document doc, string text)
+ requires (doc is GXml.TDocument)
{
_doc = doc;
_str = text;
diff --git a/gxml/TwDocument.vala b/gxml/TDocument.vala
similarity index 96%
rename from gxml/TwDocument.vala
rename to gxml/TDocument.vala
index 6f0f663..348eef4 100644
--- a/gxml/TwDocument.vala
+++ b/gxml/TDocument.vala
@@ -1,4 +1,4 @@
-/* Element.vala
+/* TDocument.vala
*
* Copyright (C) 2015 Daniel Espinosa <esodan gmail com>
*
@@ -28,7 +28,7 @@ using Xml;
* This class use { link Xml.TextWriter} to write down XML documents using
* its contained { link GXml.Node} childs or other XML structures.
*/
-public class GXml.TwDocument : GXml.TwNode, GXml.Document
+public class GXml.TDocument : GXml.TNode, GXml.Document
{
protected Gee.ArrayList<GXml.Node> _namespaces;
protected Gee.ArrayList<GXml.Node> _children;
@@ -36,8 +36,8 @@ public class GXml.TwDocument : GXml.TwNode, GXml.Document
construct {
_name = "#document";
}
- public TwDocument () {}
- public TwDocument.for_path (string file)
+ public TDocument () {}
+ public TDocument.for_path (string file)
{
var f = File.new_for_path (file);
this.file = f;
@@ -59,7 +59,7 @@ public class GXml.TwDocument : GXml.TwNode, GXml.Document
* { inheritDoc}
*
* All namespaces are stored at { link GXml.Node.namespaces} owned by
- * this { link GXml.TwDocument}.
+ * this { link GXml.TDocument}.
*
* First namespace at list, is considered default one for the document. If
* you haven't declared a namespace for this document or for its root element,
@@ -72,7 +72,7 @@ public class GXml.TwDocument : GXml.TwNode, GXml.Document
public override bool set_namespace (string uri, string? prefix)
{
if (_namespaces == null) _namespaces = new Gee.ArrayList<GXml.Node> ();
- _namespaces.add (new TwNamespace (this, uri, prefix));
+ _namespaces.add (new TNamespace (this, uri, prefix));
return true;
}
public override GXml.Document document { get { return this; } }
@@ -104,28 +104,28 @@ public class GXml.TwDocument : GXml.TwNode, GXml.Document
}
public GXml.Node create_comment (string text)
{
- var c = new TwComment (this, text);
+ var c = new TComment (this, text);
return c;
}
public GXml.Node create_pi (string target, string data)
{
- var pi = new TwProcessingInstruction (this, target, data);
+ var pi = new TProcessingInstruction (this, target, data);
return pi;
}
public GXml.Node create_element (string name) throws GLib.Error
{
if (Xmlx.validate_name (name, 1) != 0)
throw new GXml.Error.PARSER (_("Invalid element name"));
- return new TwElement (this, name);
+ return new TElement (this, name);
}
public GXml.Node create_text (string text)
{
- var t = new TwText (this, text);
+ var t = new TText (this, text);
return t;
}
public GXml.Node create_cdata (string text)
{
- var t = new TwCDATA (this, text);
+ var t = new TCDATA (this, text);
return t;
}
public bool save (GLib.Cancellable? cancellable = null)
@@ -369,7 +369,7 @@ public class GXml.TwDocument : GXml.TwNode, GXml.Document
public override string to_string ()
{
#if DEBUG
- GLib.message ("TwDocument: to_string ()");
+ GLib.message ("TDocument: to_string ()");
#endif
Xml.Doc doc = new Xml.Doc ();
Xml.TextWriter tw = Xmlx.new_text_writer_doc (ref doc);
diff --git a/gxml/TwElement.vala b/gxml/TElement.vala
similarity index 89%
rename from gxml/TwElement.vala
rename to gxml/TElement.vala
index 8721578..240337e 100644
--- a/gxml/TwElement.vala
+++ b/gxml/TElement.vala
@@ -1,4 +1,4 @@
-/* Element.vala
+/* TElement.vala
*
* Copyright (C) 2015 Daniel Espinosa <esodan gmail com>
*
@@ -24,14 +24,14 @@ using Gee;
/**
* Class implemeting { link GXml.Element} interface, not tied to libxml-2.0 library.
*/
-public class GXml.TwElement : GXml.TwNode, GXml.Element
+public class GXml.TElement : GXml.TNode, GXml.Element
{
protected Gee.HashMap<string,GXml.Node> _attrs;
- protected TwNode.TwChildrenList _children;
+ protected TNode.TChildrenList _children;
protected Gee.ArrayList<GXml.Node> _namespaces;
private string _content = null;
- public TwElement (GXml.Document d, string name)
- requires (d is TwDocument)
+ public TElement (GXml.Document d, string name)
+ requires (d is TDocument)
{
_doc = d;
_name = name;
@@ -53,7 +53,7 @@ public class GXml.TwElement : GXml.TwNode, GXml.Element
}
public override Gee.BidirList<GXml.Node> children {
owned get {
- if (_children == null) _children = new TwChildrenList (this);
+ if (_children == null) _children = new TChildrenList (this);
return _children.ref () as Gee.BidirList<GXml.Node>;
}
}
@@ -67,7 +67,7 @@ public class GXml.TwElement : GXml.TwNode, GXml.Element
public void set_attr (string name, string value)
{
if (":" in name) return;
- var att = new TwAttribute (document, name, value);
+ var att = new TAttribute (document, name, value);
att.set_parent (this);
attrs.set (name, att);
}
@@ -81,7 +81,7 @@ public class GXml.TwElement : GXml.TwNode, GXml.Element
return null;
}
public void set_ns_attr (Namespace ns, string name, string value) {
- var att = new TwAttribute (document, name, value);
+ var att = new TAttribute (document, name, value);
att.set_namespace (ns.uri, ns.prefix);
att.set_parent (this);
attrs.set (name, att);
diff --git a/gxml/TwNamespace.vala b/gxml/TNamespace.vala
similarity index 83%
rename from gxml/TwNamespace.vala
rename to gxml/TNamespace.vala
index 24948cb..433fc2d 100644
--- a/gxml/TwNamespace.vala
+++ b/gxml/TNamespace.vala
@@ -1,4 +1,4 @@
-/* TwAttribute.vala
+/* TNamespace.vala
*
* Copyright (C) 2015 Daniel Espinosa <esodan gmail com>
*
@@ -24,15 +24,15 @@ using Gee;
/**
* Class implemeting { link GXml.Namespace}, not tied to libxml-2.0 library.
*/
-public class GXml.TwNamespace : GXml.TwNode, GXml.Namespace
+public class GXml.TNamespace : GXml.TNode, GXml.Namespace
{
private string _uri = null;
private string _prefix = null;
- public TwNamespace (GXml.Document d, string uri, string? prefix)
- requires (d is TwDocument)
+ public TNamespace (GXml.Document d, string uri, string? prefix)
+ requires (d is TDocument)
{
_doc = d;
- ((TwDocument) document).tw = ((TwDocument) d).tw;
+ ((TDocument) document).tw = ((TDocument) d).tw;
_uri = uri;
_prefix = prefix;
}
diff --git a/gxml/TwNode.vala b/gxml/TNode.vala
similarity index 88%
rename from gxml/TwNode.vala
rename to gxml/TNode.vala
index d48a423..09d488f 100644
--- a/gxml/TwNode.vala
+++ b/gxml/TNode.vala
@@ -1,4 +1,4 @@
-/* Element.vala
+/* TNode.vala
*
* Copyright (C) 2015 Daniel Espinosa <esodan gmail com>
*
@@ -24,7 +24,7 @@ using Gee;
/**
* Base node abstract class implemeting { link GXml.Node} interface, not tied to libxml-2.0 library.
*/
-public abstract class GXml.TwNode : Object, GXml.Node
+public abstract class GXml.TNode : Object, GXml.Node
{
protected string _name = null;
protected string _value = null;
@@ -45,7 +45,7 @@ public abstract class GXml.TwNode : Object, GXml.Node
}
}
if (!found) {
- var nns = new TwNamespace (document, uri, prefix);
+ var nns = new TNamespace (document, uri, prefix);
document.namespaces.add (nns);
namespaces.add (nns);
}
@@ -53,7 +53,7 @@ public abstract class GXml.TwNode : Object, GXml.Node
}
public virtual string to_string () { return get_type ().name (); }
public virtual Gee.Map<string,GXml.Node> attrs { owned get { return new Gee.HashMap<string,GXml.Node> ();
} }
- public virtual Gee.BidirList<GXml.Node> children { owned get { return new TwChildrenList (this); } }
+ public virtual Gee.BidirList<GXml.Node> children { owned get { return new TChildrenList (this); } }
public virtual GXml.Document document { get { return _doc; } }
public virtual string name { owned get { return _name.dup (); } }
public virtual Gee.List<GXml.Namespace> namespaces { owned get { return new Gee.ArrayList<GXml.Node> (); }
}
@@ -67,11 +67,11 @@ public abstract class GXml.TwNode : Object, GXml.Node
}
public virtual void set_parent (GXml.Node node) { _parent = node; }
- protected class TwChildrenList : AbstractBidirList<GXml.Node> {
+ protected class TChildrenList : AbstractBidirList<GXml.Node> {
private GXml.Node _parent;
private Gee.ArrayList<GXml.Node> list = new Gee.ArrayList<GXml.Node> ();
- protected TwChildrenList (GXml.Node e) {
+ protected TChildrenList (GXml.Node e) {
_parent = e;
}
@@ -87,12 +87,12 @@ public abstract class GXml.TwNode : Object, GXml.Node
public override bool add (GXml.Node item) {
#if DEBUG
- GLib.message ("Is TwNode: "+(item is TwNode).to_string ());
- GLib.message ("Setting new parent to TwNode: "+item.name);
+ GLib.message ("Is TNode: "+(item is TNode).to_string ());
+ GLib.message ("Setting new parent to TNode: "+item.name);
#endif
- (item as GXml.TwNode).set_parent (_parent);
+ (item as GXml.TNode).set_parent (_parent);
#if DEBUG
- GLib.message ("Adding new TwNode: "+item.name);
+ GLib.message ("Adding new TNode: "+item.name);
#endif
return list.add (item);
}
diff --git a/gxml/TwProcessingInstruction.vala b/gxml/TProcessingInstruction.vala
similarity index 85%
rename from gxml/TwProcessingInstruction.vala
rename to gxml/TProcessingInstruction.vala
index f31c4b6..cedfdf9 100644
--- a/gxml/TwProcessingInstruction.vala
+++ b/gxml/TProcessingInstruction.vala
@@ -1,4 +1,4 @@
-/* Element.vala
+/* TProcessingInstruction.vala
*
* Copyright (C) 2015 Daniel Espinosa <esodan gmail com>
*
@@ -24,15 +24,15 @@ using Gee;
/**
* Class implemeting { link GXml.ProcessingInstruction} interface, not tied to libxml-2.0 library.
*/
-public class GXml.TwProcessingInstruction : GXml.TwNode, GXml.ProcessingInstruction
+public class GXml.TProcessingInstruction : GXml.TNode, GXml.ProcessingInstruction
{
private string _target = "";
private string _data = "";
construct {
_name = "#processinginstruction";
}
- public TwProcessingInstruction (GXml.Document doc, string target, string data)
- requires (doc is GXml.TwDocument)
+ public TProcessingInstruction (GXml.Document doc, string target, string data)
+ requires (doc is GXml.TDocument)
{
_doc = doc;
_target = target;
diff --git a/gxml/TwText.vala b/gxml/TText.vala
similarity index 85%
rename from gxml/TwText.vala
rename to gxml/TText.vala
index 1844455..1cb6c24 100644
--- a/gxml/TwText.vala
+++ b/gxml/TText.vala
@@ -1,4 +1,4 @@
-/* TwText.vala
+/* TText.vala
*
* Copyright (C) 2015 Daniel Espinosa <esodan gmail com>
*
@@ -24,17 +24,17 @@ using Gee;
/**
* Class implemeting { link GXml.Text} interface, not tied to libxml-2.0 library.
*/
-public class GXml.TwText : GXml.TwNode, GXml.Text
+public class GXml.TText : GXml.TNode, GXml.Text
{
private string _str = null;
construct {
_name = "#text";
}
- public TwText (GXml.Document d, string text)
- requires (d is GXml.TwDocument)
+ public TText (GXml.Document d, string text)
+ requires (d is GXml.TDocument)
{
_doc = d;
- ((TwDocument) document).tw = ((TwDocument) d).tw;
+ ((TDocument) document).tw = ((TDocument) d).tw;
_str = text;
}
// GXml.Node
diff --git a/gxml/TwComment.vala b/gxml/TrDocument.vala
similarity index 60%
rename from gxml/TwComment.vala
rename to gxml/TrDocument.vala
index c053e60..17c24a7 100644
--- a/gxml/TwComment.vala
+++ b/gxml/TrDocument.vala
@@ -19,28 +19,10 @@
* Daniel Espinosa <esodan gmail com>
*/
-using Gee;
-
-/**
- * Class implemeting { link GXml.Comment} interface, not tied to libxml-2.0 library.
- */
-public class GXml.TwComment : GXml.TwNode, GXml.Comment
-{
- private string _str = "";
- construct {
- _name = "#comment";
- }
- public TwComment (GXml.Document doc, string text)
- requires (doc is GXml.TwDocument)
- {
- _doc = doc;
- _str = text;
- }
- // GXml.Node
- public override string @value {
- owned get { return _str.dup (); }
- set { }
+[Compact]
+public class GXml.TrDocument {
+ public static GXml.Document read_document (InputStream istream) {
+ var b = new MemoryOutputStream.resizable ();
+
}
- // GXml.Comment
- public string str { owned get { return _str.dup (); } }
}
diff --git a/test/GXmlTest.vala b/test/GXmlTest.vala
index 9db5ec4..b2a7646 100644
--- a/test/GXmlTest.vala
+++ b/test/GXmlTest.vala
@@ -60,21 +60,21 @@ class GXmlTest {
ValaLibxml2Test.add_tests ();
SerializableTest.add_tests ();
SerializableObjectModelTest.add_tests ();
- SerializableObjectModelTwTest.add_tests ();
+ SerializableObjectModelTDocumentTest.add_tests ();
SerializableGeeTreeMapTest.add_tests ();
SerializableGeeHashMapTest.add_tests ();
SerializableGeeDualKeyMapTest.add_tests ();
SerializableGeeArrayListTest.add_tests ();
SerializableGeeCollectionsTest.add_tests ();
- SerializableGeeCollectionsTwTest.add_tests ();
+ SerializableGeeCollectionsTDocumentTest.add_tests ();
SerializableBasicTypeTest.add_tests ();
SerializableEnumerationTest.add_tests ();
Performance.add_tests ();
- TwElementTest.add_tests ();
- TwCDATATest.add_tests ();
- TwCommentTest.add_tests ();
- TwDocumentTest.add_tests ();
- TwProcessingInstructionTest.add_tests ();
+ TElementTest.add_tests ();
+ TCDATATest.add_tests ();
+ TCommentTest.add_tests ();
+ TDocumentTest.add_tests ();
+ TProcessingInstructionTest.add_tests ();
SerializablePropertyBoolTest.add_tests ();
SerializablePropertyDoubleTest.add_tests ();
SerializablePropertyFloatTest.add_tests ();
diff --git a/test/Makefile.am b/test/Makefile.am
index ae7c97e..05b1282 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -45,20 +45,20 @@ sources = \
SerializablePropertyIntTest.vala \
SerializablePropertyValueListTest.vala \
SerializableObjectModelTest.vala \
- SerializableObjectModel-Tw-Test.vala \
+ SerializableObjectModel-TDocument-Test.vala \
SerializableGeeTreeMapTest.vala \
SerializableGeeDualKeyMapTest.vala \
SerializableGeeArrayListTest.vala \
SerializableGeeHashMapTest.vala \
SerializableGeeCollectionsTest.vala \
- SerializableGeeCollections-Tw-Test.vala \
+ SerializableGeeCollections-TDocument-Test.vala \
SerializableBasicTypesTest.vala \
gxml-performance.vala \
- TwElementTest.vala \
- TwDocumentTest.vala \
- TwCDATATest.vala \
- TwCommentTest.vala \
- TwProcessingInstructionTest.vala \
+ TElementTest.vala \
+ TDocumentTest.vala \
+ TCDATATest.vala \
+ TCommentTest.vala \
+ TProcessingInstructionTest.vala \
GDocumentTest.vala \
GElementTest.vala \
GAttributeTest.vala \
diff --git a/test/SerializableGeeArrayListTest.vala b/test/SerializableGeeArrayListTest.vala
index c562b98..479b0dd 100644
--- a/test/SerializableGeeArrayListTest.vala
+++ b/test/SerializableGeeArrayListTest.vala
@@ -121,7 +121,7 @@ class SerializableGeeArrayListTest : GXmlTest
var o2 = new AElement.named ("Small");
c.add (o1);
c.add (o2);
- var doc = new TwDocument ();
+ var doc = new TDocument ();
var root = doc.create_element ("root");
doc.children.add (root);
c.serialize (root);
@@ -194,7 +194,7 @@ class SerializableGeeArrayListTest : GXmlTest
var iroot = idoc.root;
var ic = new SerializableArrayList<AElement> ();
ic.deserialize (iroot);
- var doc = new TwDocument ();
+ var doc = new TDocument ();
var root = doc.create_element ("root");
doc.children.add (root);
ic.serialize (root);
diff --git a/test/SerializableGeeCollections-Tw-Test.vala
b/test/SerializableGeeCollections-TDocument-Test.vala
similarity index 98%
rename from test/SerializableGeeCollections-Tw-Test.vala
rename to test/SerializableGeeCollections-TDocument-Test.vala
index 198e8be..77b29bd 100644
--- a/test/SerializableGeeCollections-Tw-Test.vala
+++ b/test/SerializableGeeCollections-TDocument-Test.vala
@@ -26,7 +26,7 @@
using GXml;
using Gee;
-class SerializableGeeCollectionsTwTest : GXmlTest
+class SerializableGeeCollectionsTDocumentTest : GXmlTest
{
class Citizen : SerializableObjectModel
{
@@ -220,7 +220,7 @@ class SerializableGeeCollectionsTwTest : GXmlTest
</storage>
</base>""");
var sb = new SpaceBase ();
- // TODO: implement deserialize TwDocument
+ // TODO: implement deserialize TDocument
sb.deserialize (doc);
assert (sb.charge_zone != null);
assert (sb.charge_zone.spaceships != null);
@@ -230,7 +230,7 @@ class SerializableGeeCollectionsTwTest : GXmlTest
assert (sbsh1.spaces != null);
assert (sbsh1.spaces.size == 2);
// Check serialize
- var ndoc = new TwDocument ();
+ var ndoc = new TDocument ();
sb.serialize (ndoc);
assert (ndoc.root != null);
assert (ndoc.root.name == "base");
@@ -406,7 +406,7 @@ class SerializableGeeCollectionsTwTest : GXmlTest
Test.add_func ("/gxml/tw/serializable/convined_gee_containers/se-deserialize-unknowns",
() => {
try {
- // TODO: TwDocument Read XML files
+ // TODO: TDocument Read XML files
var org_doc = new GDocument.from_string ("""<?xml version="1.0"?>
<base name="AlphaOne" >
<chargezone name="A1-1">
@@ -460,7 +460,7 @@ class SerializableGeeCollectionsTwTest : GXmlTest
assert (refaction.unknown_serializable_properties != null);
assert (refaction.unknown_serializable_properties.size == 0);
assert (refaction.unknown_serializable_nodes.size == 5); // 1 node 4 texts (identation)
- var doc = new TwDocument ();
+ var doc = new TDocument ();
s.serialize (doc);
assert (doc.root.name == "base");
//stdout.printf (@"$doc\n");
diff --git a/test/SerializableGeeCollectionsTest.vala b/test/SerializableGeeCollectionsTest.vala
index a91c582..10f7edf 100644
--- a/test/SerializableGeeCollectionsTest.vala
+++ b/test/SerializableGeeCollectionsTest.vala
@@ -641,7 +641,7 @@ class SerializableGeeCollectionsTest : GXmlTest
}
assert (bag.bags.size == 2);
// Construct XML
- var d = new TwDocument ();
+ var d = new TDocument ();
bag.serialize (d);
assert (d.root != null);
assert (d.root.name == "BigBag");
@@ -654,7 +654,7 @@ class SerializableGeeCollectionsTest : GXmlTest
bag2.deserialize (d);
assert (bag2.bags.size == 0);
// Serialize
- var d2 = new TwDocument ();
+ var d2 = new TDocument ();
bag2.serialize (d2);
assert (d2.root != null);
assert (d2.root.name == "BigBag");
diff --git a/test/SerializableGeeDualKeyMapTest.vala b/test/SerializableGeeDualKeyMapTest.vala
index 4122538..5297810 100644
--- a/test/SerializableGeeDualKeyMapTest.vala
+++ b/test/SerializableGeeDualKeyMapTest.vala
@@ -179,7 +179,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 TwDocument ();
+ var doc = new TDocument ();
var root = doc.create_element ("root");
doc.children.add (root);
c.serialize (root);
diff --git a/test/SerializableGeeHashMapTest.vala b/test/SerializableGeeHashMapTest.vala
index 86cebaa..f741f1f 100644
--- a/test/SerializableGeeHashMapTest.vala
+++ b/test/SerializableGeeHashMapTest.vala
@@ -152,7 +152,7 @@ class SerializableGeeHashMapTest : GXmlTest
o2.set_value ("FAKE TEXT");
c.set (o1.name, o1);
c.set (o2.name, o2);
- var doc = new TwDocument ();
+ var doc = new TDocument ();
var root = doc.create_element ("root");
doc.children.add (root);
c.serialize (root);
@@ -267,7 +267,7 @@ class SerializableGeeHashMapTest : GXmlTest
c.storage = new Space.Collection ();
c.storage.set (o1.name, o1);
c.storage.set (o2.name, o2);
- var doc = new TwDocument ();
+ var doc = new TDocument ();
c.serialize (doc);
assert (doc.root != null);
assert (doc.root.name == "spacecontainer");
@@ -307,7 +307,7 @@ class SerializableGeeHashMapTest : GXmlTest
</spacecontainer>""");
var isc = new SpaceContainer ();
isc.deserialize (idoc);
- var doc = new TwDocument ();
+ var doc = new TDocument ();
isc.serialize (doc);
var sc = new SpaceContainer ();
sc.deserialize (doc);
diff --git a/test/SerializableGeeTreeMapTest.vala b/test/SerializableGeeTreeMapTest.vala
index f4fcf28..4e811d9 100644
--- a/test/SerializableGeeTreeMapTest.vala
+++ b/test/SerializableGeeTreeMapTest.vala
@@ -139,7 +139,7 @@ class SerializableGeeTreeMapTest : GXmlTest
var o2 = new Space.named ("Small");
c.set (o1.name, o1);
c.set (o2.name, o2);
- var doc = new TwDocument ();
+ var doc = new TDocument ();
var root = doc.create_element ("root");
doc.children.add (root);
c.serialize (root);
@@ -248,7 +248,7 @@ class SerializableGeeTreeMapTest : GXmlTest
c.storage = new Space.Collection ();
c.storage.set (o1.name, o1);
c.storage.set (o2.name, o2);
- var doc = new TwDocument ();
+ var doc = new TDocument ();
c.serialize (doc);
if (doc.root == null) {
stdout.printf (@"ERROR: doc have no root node\n$(doc)\n");
diff --git a/test/SerializableObjectModel-Tw-Test.vala b/test/SerializableObjectModel-TDocument-Test.vala
similarity index 97%
rename from test/SerializableObjectModel-Tw-Test.vala
rename to test/SerializableObjectModel-TDocument-Test.vala
index 66c5298..a450814 100644
--- a/test/SerializableObjectModel-Tw-Test.vala
+++ b/test/SerializableObjectModel-TDocument-Test.vala
@@ -25,7 +25,7 @@
*/
using GXml;
using Gee;
-class SerializableObjectModelTwTest : GXmlTest
+class SerializableObjectModelTDocumentTest : GXmlTest
{
public static void add_tests ()
{
@@ -33,7 +33,7 @@ class SerializableObjectModelTwTest : GXmlTest
() => {
try {
var computer = new Computer ();
- var doc = new TwDocument ();
+ var doc = new TDocument ();
computer.serialize (doc);
assert (doc.root.name.down () == "computer") ;
var m = doc.root.attrs.get ("manufacturer");
@@ -54,7 +54,7 @@ class SerializableObjectModelTwTest : GXmlTest
);
Test.add_func ("/gxml/tw/serializable/object_model/serialize_object_contents",
() => {
- var doc = new TwDocument ();
+ var doc = new TDocument ();
var manual = new Manual ();
assert (manual.document == "MANUAL DOCUMENTATION");
assert (manual.pages == 3);
@@ -70,7 +70,7 @@ class SerializableObjectModelTwTest : GXmlTest
Test.add_func ("/gxml/tw/serializable/object_model/serialize_serializable_properties",
() => {
- var doc = new TwDocument ();
+ var doc = new TDocument ();
var package = new Package ();
try {
package.serialize (doc);
@@ -99,7 +99,7 @@ class SerializableObjectModelTwTest : GXmlTest
});
Test.add_func ("/gxml/tw/serializable/object_model/serialize_array_property",
() => {
- var doc = new TwDocument ();
+ var doc = new TDocument ();
var package = new Package ();
package.tags.append_val ("Computer");
package.tags.append_val ("Customer");
@@ -145,7 +145,7 @@ class SerializableObjectModelTwTest : GXmlTest
});
Test.add_func ("/gxml/tw/serializable/object_model/serialize_property_nick",
() => {
- var doc = new TwDocument ();
+ var doc = new TDocument ();
var monitor = new Monitor ();
try {
monitor.resolution = "1204x720";
@@ -202,7 +202,7 @@ class SerializableObjectModelTwTest : GXmlTest
cpu.piles.add (1);
cpu.piles.add (2);
cpu.piles.add (3);
- var doc = new TwDocument ();
+ var doc = new TDocument ();
try {
cpu.serialize (doc);
//stdout.printf (@"$doc");
@@ -240,7 +240,7 @@ class SerializableObjectModelTwTest : GXmlTest
});*/
Test.add_func ("/gxml/tw/serializable/object_model/override_serialize",
() => {
- var doc = new TwDocument ();
+ var doc = new TDocument ();
var configuration = new Configuration ();
configuration.device = "Controller";
try {
@@ -283,7 +283,7 @@ class SerializableObjectModelTwTest : GXmlTest
Test.add_func ("/gxml/tw/serializable/object_model/set_namespace", () => {
try {
var ns = new NameSpace ();
- var doc = new TwDocument ();
+ var doc = new TDocument ();
ns.serialize (doc);
string str = doc.to_string ();
#if DEBUG
@@ -300,7 +300,7 @@ class SerializableObjectModelTwTest : GXmlTest
Test.add_func ("/gxml/tw/serializable/object_model/find-unknown_property", () => {
try {
var p = new Package ();
- var doc = new TwDocument ();
+ var doc = new TDocument ();
var r = (Element) doc.create_element ("PACKAGE");
doc.children.add (r);
r.set_attr ("source", "Mexico/North");
@@ -322,7 +322,7 @@ class SerializableObjectModelTwTest : GXmlTest
Test.add_func ("/gxml/tw/serializable/object_model/find-unknown_node", () => {
try {
var p = new Package ();
- var doc = new TwDocument ();
+ var doc = new TDocument ();
var r = (Element) doc.create_element ("PACKAGE");
doc.children.add (r);
r.set_attr ("source", "Mexico/North");
@@ -352,11 +352,11 @@ class SerializableObjectModelTwTest : GXmlTest
assert_not_reached ();
}
});/*
- // TODO: Add deserialize to TwDocument
+ // TODO: Add deserialize to TDocument
Test.add_func ("/gxml/tw/serializable/object_model/override_transform_from_string",
() => {
var cpu = new Cpu ();
- var doc = new TwDocument.from_string (XML_CPU_FILE);
+ var doc = new TDocument.from_string (XML_CPU_FILE);
try {
cpu.deserialize (doc);
//stdout.printf (@"$doc");
diff --git a/test/TwCDATATest.vala b/test/TCDATATest.vala
similarity index 94%
rename from test/TwCDATATest.vala
rename to test/TCDATATest.vala
index 5d4f998..6730974 100644
--- a/test/TwCDATATest.vala
+++ b/test/TCDATATest.vala
@@ -1,5 +1,5 @@
/* -*- Mode: vala; indent-tabs-mode: t; c-basic-offset: 2; tab-width: 2 -*- */
-/* TwCDATATest.vala
+/* TCDATATest.vala
*
* Copyright (C) 2011-2015 Daniel Espinosa <esodan gmail com>
*
@@ -22,11 +22,11 @@
using GXml;
-class TwCDATATest : GXmlTest {
+class TCDATATest : GXmlTest {
public static void add_tests () {
Test.add_func ("/gxml/tw-cdata", () => {
try {
- var d = new TwDocument ();
+ var d = new TDocument ();
var r = d.create_element ("root");
d.children.add (r);
var cd = d.create_cdata ("<test/>");
diff --git a/test/TwCommentTest.vala b/test/TCommentTest.vala
similarity index 94%
rename from test/TwCommentTest.vala
rename to test/TCommentTest.vala
index 95e1f46..be92148 100644
--- a/test/TwCommentTest.vala
+++ b/test/TCommentTest.vala
@@ -1,5 +1,5 @@
/* -*- Mode: vala; indent-tabs-mode: t; c-basic-offset: 2; tab-width: 2 -*- */
-/* TwCDATATest.vala
+/* TCDATATest.vala
*
* Copyright (C) 2011-2015 Daniel Espinosa <esodan gmail com>
*
@@ -22,11 +22,11 @@
using GXml;
-class TwCommentTest : GXmlTest {
+class TCommentTest : GXmlTest {
public static void add_tests () {
Test.add_func ("/gxml/tw-comment", () => {
try {
- var d = new TwDocument ();
+ var d = new TDocument ();
var r = d.create_element ("root");
d.children.add (r);
var c = d.create_comment ("This is a comment");
diff --git a/test/TwDocumentTest.vala b/test/TDocumentTest.vala
similarity index 92%
rename from test/TwDocumentTest.vala
rename to test/TDocumentTest.vala
index 1a41e47..38fed82 100644
--- a/test/TwDocumentTest.vala
+++ b/test/TDocumentTest.vala
@@ -22,8 +22,8 @@
using GXml;
-class TwDocumentTest : GXmlTest {
- public class TwTestObject : SerializableObjectModel
+class TDocumentTest : GXmlTest {
+ public class TTestObject : SerializableObjectModel
{
public string name { get; set; }
public override string node_name () { return "Test"; }
@@ -32,7 +32,7 @@ class TwDocumentTest : GXmlTest {
public static void add_tests () {
Test.add_func ("/gxml/tw-document", () => {
try {
- var d = new TwDocument ();
+ var d = new TDocument ();
assert (d.name == "#document");
assert (d.root == null);
assert (d.children != null);
@@ -51,7 +51,7 @@ class TwDocumentTest : GXmlTest {
try {
var f = GLib.File.new_for_path (GXmlTestConfig.TEST_SAVE_DIR+"/tw-test.xml");
if (f.query_exists ()) f.delete ();
- var d = new TwDocument.for_path (GXmlTestConfig.TEST_SAVE_DIR+"/tw-test.xml");
+ var d = new TDocument.for_path (GXmlTestConfig.TEST_SAVE_DIR+"/tw-test.xml");
var e = d.create_element ("root");
d.children.add (e);
assert (d.children.size == 1);
@@ -70,7 +70,7 @@ class TwDocumentTest : GXmlTest {
try {
var f = GLib.File.new_for_path
(GXmlTestConfig.TEST_SAVE_DIR+"/tw-test.xml");
if (f.query_exists ()) f.delete ();
- var d = new TwDocument.for_path
(GXmlTestConfig.TEST_SAVE_DIR+"/tw-test.xml");
+ var d = new TDocument.for_path
(GXmlTestConfig.TEST_SAVE_DIR+"/tw-test.xml");
var e = d.create_element ("root");
d.children.add (e);
assert (d.children.size == 1);
@@ -98,7 +98,7 @@ class TwDocumentTest : GXmlTest {
try {
var f = GLib.File.new_for_path
(GXmlTestConfig.TEST_SAVE_DIR+"/tw-test.xml");
if (f.query_exists ()) f.delete ();
- var d = new TwDocument.for_path
(GXmlTestConfig.TEST_SAVE_DIR+"/tw-test.xml");
+ var d = new TDocument.for_path
(GXmlTestConfig.TEST_SAVE_DIR+"/tw-test.xml");
var e = d.create_element ("root");
d.children.add (e);
assert (d.children.size == 1);
@@ -135,7 +135,7 @@ class TwDocumentTest : GXmlTest {
try {
var f = GLib.File.new_for_path
(GXmlTestConfig.TEST_SAVE_DIR+"/tw-test.xml");
if (f.query_exists ()) f.delete ();
- var d = new TwDocument.for_path
(GXmlTestConfig.TEST_SAVE_DIR+"/tw-test.xml");
+ var d = new TDocument.for_path
(GXmlTestConfig.TEST_SAVE_DIR+"/tw-test.xml");
var e = d.create_element ("root");
d.children.add (e);
assert (d.children.size == 1);
@@ -143,11 +143,11 @@ class TwDocumentTest : GXmlTest {
assert (d.root.name == "root");
assert (d.root.value == "");
var root = (GXml.Element) d.root;
- root.content = "GXml TwDocument Test";
+ root.content = "GXml TDocument Test";
assert (root.children.size == 1);
- assert (root.content == "GXml TwDocument Test");
+ assert (root.content == "GXml TDocument Test");
var t = root.children.get (0);
- assert (t.value == "GXml TwDocument Test");
+ assert (t.value == "GXml TDocument Test");
assert (t is GXml.Text);
//GLib.message (@"$d");
d.save ();
@@ -157,7 +157,7 @@ class TwDocumentTest : GXmlTest {
istream.close ();
assert ("<?xml version=\"1.0\"?>" in ((string)buffer));
assert ("<root" in ((string)buffer));
- assert (">GXml TwDocument Test<" in ((string)buffer));
+ assert (">GXml TDocument Test<" in ((string)buffer));
}
catch (GLib.Error e) {
#if DEBUG
@@ -170,7 +170,7 @@ class TwDocumentTest : GXmlTest {
try {
var f = GLib.File.new_for_path
(GXmlTestConfig.TEST_SAVE_DIR+"/tw-test.xml");
if (f.query_exists ()) f.delete ();
- var d = new TwDocument.for_path
(GXmlTestConfig.TEST_SAVE_DIR+"/tw-test.xml");
+ var d = new TDocument.for_path
(GXmlTestConfig.TEST_SAVE_DIR+"/tw-test.xml");
var e = d.create_element ("root");
d.children.add (e);
assert (d.children.size == 1);
@@ -207,7 +207,7 @@ class TwDocumentTest : GXmlTest {
});
Test.add_func ("/gxml/tw-document/root/children-children", () => {
#if DEBUG
- GLib.message (@"TwDocument root children/children...");
+ GLib.message (@"TDocument root children/children...");
#endif
try {
#if DEBUG
@@ -218,7 +218,7 @@ class TwDocumentTest : GXmlTest {
#if DEBUG
GLib.message (@"Creating Document...");
#endif
- var d = new TwDocument.for_path
(GXmlTestConfig.TEST_SAVE_DIR+"/tw-large.xml");
+ var d = new TDocument.for_path (GXmlTestConfig.TEST_SAVE_DIR+"/tw-large.xml");
var e = d.create_element ("bookstore");
d.children.add (e);
assert (d.children.size == 1);
@@ -270,7 +270,7 @@ class TwDocumentTest : GXmlTest {
});
Test.add_func ("/gxml/tw-document/save/children-children", () => {
#if DEBUG
- GLib.message (@"TwDocument root children/children...");
+ GLib.message (@"TDocument root children/children...");
#endif
try {
#if DEBUG
@@ -281,7 +281,7 @@ class TwDocumentTest : GXmlTest {
#if DEBUG
GLib.message (@"Creating Document...");
#endif
- var d = new TwDocument.for_path
(GXmlTestConfig.TEST_SAVE_DIR+"/tw-large.xml");
+ var d = new TDocument.for_path (GXmlTestConfig.TEST_SAVE_DIR+"/tw-large.xml");
var e = d.create_element ("bookstore");
d.children.add (e);
assert (d.children.size == 1);
@@ -340,12 +340,12 @@ class TwDocumentTest : GXmlTest {
try {
var f = GLib.File.new_for_path
(GXmlTestConfig.TEST_SAVE_DIR+"/tw-test.xml");
if (f.query_exists ()) f.delete ();
- var ot = new TwTestObject ();
+ var ot = new TTestObject ();
ot.name = "test1";
- var dt = new TwDocument ();
+ var dt = new TDocument ();
ot.serialize (dt);
dt.save_as (f);
- var d = new TwDocument ();
+ var d = new TDocument ();
var e = d.create_element ("root");
d.children.add (e);
assert (d.children.size == 1);
@@ -372,7 +372,7 @@ class TwDocumentTest : GXmlTest {
}
});
Test.add_func ("/gxml/tw-document/to_string", () => {
- var doc = new TwDocument ();
+ var doc = new TDocument ();
var r = doc.create_element ("root");
doc.children.add (r);
#if DEBUG
@@ -385,7 +385,7 @@ class TwDocumentTest : GXmlTest {
});
Test.add_func ("/gxml/tw-document/namespace", () => {
try {
- var doc = new TwDocument ();
+ var doc = new TDocument ();
doc.children.add (doc.create_element ("root"));
doc.set_namespace ("http://www.gnome.org/GXml","gxml";);
Test.message ("ROOT: "+doc.to_string ());
@@ -423,7 +423,7 @@ class TwDocumentTest : GXmlTest {
}
});
Test.add_func ("/gxml/tw-document/parent", () => {
- var doc = new TwDocument ();
+ var doc = new TDocument ();
assert (doc.parent == null);
});
}
diff --git a/test/TwElementTest.vala b/test/TElementTest.vala
similarity index 97%
rename from test/TwElementTest.vala
rename to test/TElementTest.vala
index 3f1d0e0..67f6723 100644
--- a/test/TwElementTest.vala
+++ b/test/TElementTest.vala
@@ -24,11 +24,11 @@
using GXml;
-class TwElementTest : GXmlTest {
+class TElementTest : GXmlTest {
public static void add_tests () {
Test.add_func ("/gxml/tw-element/api", () => {
try {
- var d = new TwDocument ();
+ var d = new TDocument ();
var e = (Element) d.create_element ("element");
d.children.add (e);
assert (d.children.size == 1);
@@ -62,7 +62,7 @@ class TwElementTest : GXmlTest {
});
Test.add_func ("/gxml/tw-element/content", () => {
try {
- var d = new TwDocument ();
+ var d = new TDocument ();
var e = (Element) d.create_element ("element");
d.children.add (e);
assert (d.children.size == 1);
@@ -104,7 +104,7 @@ class TwElementTest : GXmlTest {
});
Test.add_func ("/gxml/tw-element/namespaces/default", () => {
try {
- var d = new TwDocument ();
+ var d = new TDocument ();
var r = d.create_element ("root");
d.children.add (r);
// Set default namespace
@@ -121,7 +121,7 @@ class TwElementTest : GXmlTest {
});
Test.add_func ("/gxml/tw-element/namespaces/default-prefix", () => {
try {
- var d = new TwDocument ();
+ var d = new TDocument ();
var r = d.create_element ("root");
d.children.add (r);
// Set default namespace
@@ -138,7 +138,7 @@ class TwElementTest : GXmlTest {
});
Test.add_func ("/gxml/tw-element/namespaces/default-prefix-null", () => {
try {
- var d = new TwDocument ();
+ var d = new TDocument ();
var r = d.create_element ("root");
d.children.add (r);
// Set default namespace
@@ -155,7 +155,7 @@ class TwElementTest : GXmlTest {
});
Test.add_func ("/gxml/tw-element/namespaces/default/enable-prefix_default_ns", () => {
try {
- var d = new TwDocument ();
+ var d = new TDocument ();
var r = d.create_element ("root");
d.children.add (r);
// Set default namespace
@@ -173,7 +173,7 @@ class TwElementTest : GXmlTest {
});
Test.add_func ("/gxml/tw-element/multiple-namespaces", () => {
try {
- var d = new TwDocument ();
+ var d = new TDocument ();
var r = d.create_element ("root");
d.children.add (r);
r.set_namespace ("http://git.gnome.org/browse/gxml";, "gxml");
@@ -204,7 +204,7 @@ class TwElementTest : GXmlTest {
});
Test.add_func ("/gxml/tw-element/multiple-namespaces/default/basic", () => {
try {
- var d = new TwDocument ();
+ var d = new TDocument ();
var r = d.create_element ("root");
d.children.add (r);
// Default NS
@@ -250,7 +250,7 @@ class TwElementTest : GXmlTest {
});
Test.add_func ("/gxml/tw-element/multiple-namespaces/enable-prefix_default_ns", () => {
try {
- var d = new TwDocument ();
+ var d = new TDocument ();
var r = d.create_element ("root");
d.children.add (r);
d.prefix_default_ns = true;
@@ -287,7 +287,7 @@ class TwElementTest : GXmlTest {
});
Test.add_func ("/gxml/tw-element/multiple-namespaces/default/1", () => {
try {
- var d = new TwDocument ();
+ var d = new TDocument ();
var r = d.create_element ("root");
d.children.add (r);
// Default NS
@@ -333,7 +333,7 @@ class TwElementTest : GXmlTest {
});
Test.add_func ("/gxml/tw-element/multiple-namespaces/default/enable-ns_top", () => {
try {
- var d = new TwDocument ();
+ var d = new TDocument ();
var r = d.create_element ("root");
d.children.add (r);
// Default NS
@@ -386,7 +386,7 @@ class TwElementTest : GXmlTest {
});
Test.add_func ("/gxml/tw-element/multiple-namespaces/child-default", () => {
try {
- var d = new TwDocument ();
+ var d = new TDocument ();
var r = d.create_element ("root");
d.children.add (r);
// Default NS
@@ -440,7 +440,7 @@ class TwElementTest : GXmlTest {
});
Test.add_func ("/gxml/tw-element/multiple-namespaces/child-default/enable-prefix_default_ns",
() => {
try {
- var d = new TwDocument ();
+ var d = new TDocument ();
var r = d.create_element ("root");
d.children.add (r);
// Default NS
@@ -494,7 +494,7 @@ class TwElementTest : GXmlTest {
});
Test.add_func ("/gxml/tw-element/multiple-namespaces/default/enable-prefix_default_ns", () =>
{
try {
- var d = new TwDocument ();
+ var d = new TDocument ();
var r = d.create_element ("root");
d.children.add (r);
// Default NS
@@ -530,7 +530,7 @@ class TwElementTest : GXmlTest {
});
Test.add_func ("/gxml/tw-element/attr-namespace", () => {
try {
- var d = new TwDocument ();
+ var d = new TDocument ();
var r = d.create_element ("root");
d.children.add (r);
// Default NS
@@ -556,7 +556,7 @@ class TwElementTest : GXmlTest {
} catch { assert_not_reached (); }
});
Test.add_func ("/gxml/tw-element/parent", () => {
- var doc = new TwDocument ();
+ var doc = new TDocument ();
var e = doc.create_element ("root");
doc.children.add (e);
var c = doc.create_element ("child");
@@ -573,7 +573,7 @@ class TwElementTest : GXmlTest {
assert (doc.root.parent == null);
});
Test.add_func ("/gxml/tw-element/attribute/parent", () => {
- var doc = new TwDocument ();
+ var doc = new TDocument ();
var e = doc.create_element ("root");
doc.children.add (e);
var c = doc.create_element ("child");
diff --git a/test/TwProcessingInstructionTest.vala b/test/TProcessingInstructionTest.vala
similarity index 93%
rename from test/TwProcessingInstructionTest.vala
rename to test/TProcessingInstructionTest.vala
index 37704e8..4d974fb 100644
--- a/test/TwProcessingInstructionTest.vala
+++ b/test/TProcessingInstructionTest.vala
@@ -1,5 +1,5 @@
/* -*- Mode: vala; indent-tabs-mode: t; c-basic-offset: 2; tab-width: 2 -*- */
-/* TwCDATATest.vala
+/* TProcessingInstructionTest.vala
*
* Copyright (C) 2011-2015 Daniel Espinosa <esodan gmail com>
*
@@ -22,11 +22,11 @@
using GXml;
-class TwProcessingInstructionTest : GXmlTest {
+class TProcessingInstructionTest : GXmlTest {
public static void add_tests () {
Test.add_func ("/gxml/tw-processinginstruction", () => {
try {
- var d = new TwDocument ();
+ var d = new TDocument ();
var r = d.create_element ("root");
d.children.add (r);
var pi = d.create_pi ("xslt","transform");
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
