[gxml] Fixes on TwComment implementation
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gxml] Fixes on TwComment implementation
- Date: Wed, 13 May 2015 20:50:22 +0000 (UTC)
commit d2fc905ecb1388b2ce5351ea066ec49bf9dd01d5
Author: Daniel Espinosa <esodan gmail com>
Date: Tue May 12 15:16:58 2015 -0500
Fixes on TwComment implementation
gxml/TwComment.vala | 6 +++++-
gxml/TwDocument.vala | 5 +----
test/GXmlTest.vala | 1 +
test/TwCommentTest.vala | 11 ++++++-----
4 files changed, 13 insertions(+), 10 deletions(-)
---
diff --git a/gxml/TwComment.vala b/gxml/TwComment.vala
index 957d319..8d9247a 100644
--- a/gxml/TwComment.vala
+++ b/gxml/TwComment.vala
@@ -28,9 +28,13 @@ public class GXml.TwComment : GXml.TwNode, GXml.Comment
requires (doc is GXml.TwDocument)
{
_doc = doc;
- ((TwDocument) document).tw = ((TwDocument) doc).tw;
_str = text;
}
+ // GXml.Node
+ public override string @value {
+ get { return _str; }
+ set { _str = value; }
+ }
// GXml.Comment
public string str { get { return _str; } }
}
diff --git a/gxml/TwDocument.vala b/gxml/TwDocument.vala
index 71c30bb..029dde6 100644
--- a/gxml/TwDocument.vala
+++ b/gxml/TwDocument.vala
@@ -46,9 +46,6 @@ public class GXml.TwDocument : GXml.TwNode, GXml.Document
public GXml.Node create_comment (string text)
{
var c = new TwComment (this, text);
- if (root == null)
- return c;
- root.childs.add (c);
return c;
}
public GXml.Node create_element (string name)
@@ -185,7 +182,7 @@ public class GXml.TwDocument : GXml.TwNode, GXml.Document
}
if (n is GXml.Comment) {
#if DEBUG
- GLib.message (@"Starting Child Element: writting Text '$(n.value)'");
+ GLib.message (@"Starting Child Element: writting Comment '$(n.value)'");
#endif
size += tw.write_comment (n.value);
if (size > 1500)
diff --git a/test/GXmlTest.vala b/test/GXmlTest.vala
index b3e640a..56a3ac1 100644
--- a/test/GXmlTest.vala
+++ b/test/GXmlTest.vala
@@ -73,6 +73,7 @@ class GXmlTest {
Performance.add_tests ();
TwElementTest.add_tests ();
TwCDATATest.add_tests ();
+ TwCommentTest.add_tests ();
TwDocumentTest.add_tests ();
Test.run ();
diff --git a/test/TwCommentTest.vala b/test/TwCommentTest.vala
index 4854882..e5473ee 100644
--- a/test/TwCommentTest.vala
+++ b/test/TwCommentTest.vala
@@ -22,19 +22,20 @@
using GXml;
-class TwComentTest : GXmlTest {
+class TwCommentTest : GXmlTest {
public static void add_tests () {
Test.add_func ("/gxml/tw-comment", () => {
try {
var d = new TwDocument ();
var r = d.create_element ("root");
d.childs.add (r);
- var cd = d.create_comment ("This is a comment");
- assert (cd.value == "This is a comment");
- d.root.childs.add (cd);
+ var c = d.create_comment ("This is a comment");
+ assert (c.value == "This is a comment");
+ d.root.childs.add (c);
+ GLib.message (@"$d");
assert (d.root.childs.size == 1);
string str = d.to_string ();
- assert ("<root><!This is a comment></root>" in str);
+ assert ("<root><!--This is a comment--></root>" in str);
#if DEBUG
GLib.message (@"$d");
#endif
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]