[gxml] Removing Vala warnings
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gxml] Removing Vala warnings
- Date: Wed, 1 Mar 2017 18:56:59 +0000 (UTC)
commit c48c930122d30c8d55b2c17e766c9055c36a652c
Author: Daniel Espinosa <esodan gmail com>
Date: Wed Mar 1 12:55:23 2017 -0600
Removing Vala warnings
gxml/GXmlHashMapAttr.vala | 2 +-
test/DomGDocumentTest.vala | 33 ----------------
test/GDocumentTest.vala | 5 --
test/GomDocumentTest.vala | 12 +----
test/GomElementTest.vala | 5 --
test/GomSerializationTest.vala | 40 --------------------
test/SerializableGeeArrayListTest.vala | 5 --
.../SerializableGeeCollections-TDocument-Test.vala | 6 +--
test/SerializableGeeCollectionsTest.vala | 11 +----
test/SerializableGeeHashMapTest.vala | 5 --
test/TDocumentTest.vala | 17 --------
test/gxml-performance.vala | 6 +--
12 files changed, 10 insertions(+), 137 deletions(-)
---
diff --git a/gxml/GXmlHashMapAttr.vala b/gxml/GXmlHashMapAttr.vala
index 309271c..aea6770 100644
--- a/gxml/GXmlHashMapAttr.vala
+++ b/gxml/GXmlHashMapAttr.vala
@@ -104,11 +104,11 @@ public class GXml.GHashMapAttr : Gee.AbstractMap<string,GXml.Node>,
_node->new_prop (key, value.@value);
}
public override bool unset (string key, out GXml.Node value = null) {
+ value = null;
if (_node == null) return false;
var p = _node->has_prop (key);
if (p == null) return false;
p->remove ();
- value = null;
return true;
}
public override Gee.Set<Gee.Map.Entry<string,GXml.Node>> entries {
diff --git a/test/DomGDocumentTest.vala b/test/DomGDocumentTest.vala
index 55f6e0d..396ce03 100644
--- a/test/DomGDocumentTest.vala
+++ b/test/DomGDocumentTest.vala
@@ -514,48 +514,16 @@ const string XMLDOC ="<?xml version=\"1.0\"?>
}
});
Test.add_func ("/gxml/dom/document/event", () => {
- try {
-#if DEBUG
- GLib.message ("No implemented...Skiping");
-#endif
//TODO: implement
- } catch (GLib.Error e) {
- GLib.message ("Error: "+ e.message);
- assert_not_reached ();
- }
});
Test.add_func ("/gxml/dom/document/range", () => {
- try {
-#if DEBUG
- GLib.message ("No implemented...Skiping");
-#endif
//TODO: implement
- } catch (GLib.Error e) {
- GLib.message ("Error: "+ e.message);
- assert_not_reached ();
- }
});
Test.add_func ("/gxml/dom/document/iterator", () => {
- try {
-#if DEBUG
- GLib.message ("No implemented...Skiping");
-#endif
//TODO: implement
- } catch (GLib.Error e) {
- GLib.message ("Error: "+ e.message);
- assert_not_reached ();
- }
});
Test.add_func ("/gxml/dom/document/walker", () => {
- try {
-#if DEBUG
- GLib.message ("No implemented...Skiping");
-#endif
//TODO: implement
- } catch (GLib.Error e) {
- GLib.message ("Error: "+ e.message);
- assert_not_reached ();
- }
});
Test.add_func ("/gxml/dom/character", () => {
try {
@@ -590,7 +558,6 @@ const string XMLDOC ="<?xml version=\"1.0\"?>
d.append_child (n);
n.append_child (t);
assert (t.parent_node.child_nodes.length == 1);
- var t2 = (t as DomText).split_text (4);
assert (t.parent_node.child_nodes.length == 1);
var ntst = d.create_element ("child");
n.append_child (ntst);
diff --git a/test/GDocumentTest.vala b/test/GDocumentTest.vala
index 9d7df8c..2cc81f3 100644
--- a/test/GDocumentTest.vala
+++ b/test/GDocumentTest.vala
@@ -124,7 +124,6 @@ class GDocumentTest : GXmlTest {
});
Test.add_func ("/gxml/gdocument/construct_from_stream_error", () => {
File fin;
- InputStream instream;
FileIOStream iostream;
GDocument doc;
@@ -156,7 +155,6 @@ class GDocumentTest : GXmlTest {
try {
string xml;
GDocument doc;
- GXml.Node root;
xml = """<?xml version="1.0"?>""";
doc = new GDocument.from_string (xml);
@@ -167,7 +165,6 @@ class GDocumentTest : GXmlTest {
try {
string xml;
GDocument doc;
- GXml.Node root;
xml = "";
doc = new GDocument.from_string (xml);
@@ -175,7 +172,6 @@ class GDocumentTest : GXmlTest {
});
Test.add_func ("/gxml/gdocument/save", () => {
GDocument doc;
- int exit_status;
try {
doc = new GDocument.from_string ("<root />");
@@ -336,7 +332,6 @@ class GDocumentTest : GXmlTest {
assert (c.attrs.size == 1);
var pt = c.attrs.get ("prop");
assert (pt != null);
- var pt2 = (c as Element).get_ns_attr ("prop", doc.root.namespaces[0].uri);
#if DEBUG
GLib.message ("ROOT: "+doc.root.to_string ());
#endif
diff --git a/test/GomDocumentTest.vala b/test/GomDocumentTest.vala
index 865a854..47265b1 100644
--- a/test/GomDocumentTest.vala
+++ b/test/GomDocumentTest.vala
@@ -79,8 +79,8 @@ class GomDocumentTest : GXmlTest {
var s = new GLib.StringBuilder ();
s.append ("""<document_element />""");
var d = new GomDocument.from_string (s.str);
- var parser = new XParser (d);
#if DEBUG
+ var parser = new XParser (d);
message ("Saving to file: "+f.get_uri ());
message ("XML:\n"+parser.write_string ());
#endif
@@ -197,7 +197,6 @@ class GomDocumentTest : GXmlTest {
});
Test.add_func ("/gxml/gom-document/construct_from_stream_error", () => {
File fin;
- InputStream instream;
FileIOStream iostream;
DomDocument doc;
@@ -247,7 +246,6 @@ class GomDocumentTest : GXmlTest {
try {
string xml;
DomDocument doc;
- GXml.DomNode document_element;
xml = """<?xml version="1.0"?>""";
doc = new GomDocument.from_string (xml);
@@ -258,7 +256,6 @@ class GomDocumentTest : GXmlTest {
try {
string xml;
DomDocument doc;
- GXml.DomNode document_element;
xml = "";
doc = new GomDocument.from_string (xml);
@@ -267,7 +264,6 @@ class GomDocumentTest : GXmlTest {
});
Test.add_func ("/gxml/gom-document/save", () => {
DomDocument doc;
- int exit_status;
try {
doc = new GomDocument.from_string ("<document_element />");
@@ -358,8 +354,6 @@ class GomDocumentTest : GXmlTest {
assert (doc.document_element != null);
((DomElement) doc.document_element).set_attribute ("attrname", "attrvalue");
assert (doc.document_element.attributes.size == 1);
- var parser = new XParser (doc);
- //Test.message ("DOC:"+parser.write_string ());
var attr = ((DomElement) doc.document_element).get_attribute ("attrname");
#if DEBUG
GLib.message ("Attr value: "+attr);
@@ -392,8 +386,8 @@ class GomDocumentTest : GXmlTest {
Test.add_func ("/gxml/gom-document/to_string/extended", () => {
try {
var d = new GomDocument.from_path
(GXmlTestConfig.TEST_DIR+"/gdocument-read.xml");
- var parser = new XParser (d);
#if DEBUG
+ var parser = new XParser (d);
GLib.message ("Document Read:"+parser.write_string ());
#endif
assert (d.document_element != null);
@@ -471,9 +465,9 @@ class GomDocumentTest : GXmlTest {
xmlns:gnome="http://api.gnome.org/doap-extensions#";
xmlns="http://usefulinc.com/ns/doap#";><child/></Project>""");
assert (doc.document_element.prefix == null);
+#if DEBUG
var parser = new XParser (doc);
string str = parser.write_string ();
-#if DEBUG
message ("Read: "+str);
#endif
} catch (GLib.Error e) {
diff --git a/test/GomElementTest.vala b/test/GomElementTest.vala
index 2936811..0d7677a 100644
--- a/test/GomElementTest.vala
+++ b/test/GomElementTest.vala
@@ -28,11 +28,6 @@ class GomElementTest : GXmlTest {
DomDocument doc = null;
try {
doc = new GomDocument.from_string ("<Potions><magic:Potion
xmlns:magic=\"http://hogwarts.co.uk/magic\";
xmlns:products=\"http://diagonalley.co.uk/products\"/></Potions>");
- } catch (GLib.Error e) {
- GLib.message (e.message);
- assert_not_reached ();
- }
- try {
GXml.GomNode root = (GXml.GomNode) doc.document_element;
assert (root != null);
assert (root.node_name == "Potions");
diff --git a/test/GomSerializationTest.vala b/test/GomSerializationTest.vala
index d802017..3934acf 100644
--- a/test/GomSerializationTest.vala
+++ b/test/GomSerializationTest.vala
@@ -26,15 +26,11 @@ using GXml;
class GomName : GomElement
{
construct { try { initialize ("Name"); } catch { assert_not_reached (); } }
- public string get_name () { return this.text_content; }
- public void set_name (string name) { this.text_content = name; }
}
class GomEmail : GomElement
{
construct { try { initialize ("Email"); } catch { assert_not_reached (); } }
- public string get_mail () { return this.text_content; }
- public void set_mail (string email) { text_content = email; }
}
class GomAuthor : GomElement
@@ -132,17 +128,6 @@ class GomBookStore : GomElement
construct {
try { initialize ("BookStore"); } catch { assert_not_reached (); }
}
- public string to_string () {
- var parser = new XParser (this);
- string s = "";
- try {
- s = parser.write_string ();
- } catch (GLib.Error e) {
- GLib.message ("Error: "+e.message);
- assert_not_reached ();
- }
- return s;
- }
}
class GomSerializationTest : GXmlTest {
@@ -298,11 +283,6 @@ class GomSerializationTest : GXmlTest {
construct {
try { initialize ("BookStand"); } catch { assert_not_reached (); }
}
- public BookRegister create_register () {
- return Object.new (typeof (BookRegister),
- "element", this)
- as BookRegister;
- }
public string to_string () {
var parser = new XParser (this);
string s = "";
@@ -459,7 +439,6 @@ class GomSerializationTest : GXmlTest {
#endif
});
Test.add_func ("/gxml/gom-serialization/write/property-long-name", () => {
- try {
var t = new Taxes ();
string s = t.to_string ();
assert (s != null);
@@ -487,13 +466,8 @@ class GomSerializationTest : GXmlTest {
#if DEBUG
GLib.message ("DOC:"+s);
#endif
- } catch (GLib.Error e) {
- GLib.message ("Error: "+e.message);
- assert_not_reached ();
- }
});
Test.add_func ("/gxml/gom-serialization/write/property-date", () => {
- try {
var t = new Taxes ();
string s = t.to_string ();
assert (s != null);
@@ -523,10 +497,6 @@ class GomSerializationTest : GXmlTest {
GLib.message ("DOC:"+s);
#endif
assert ("PayDate=\"2023-03-10\"" in s);
- } catch (GLib.Error e) {
- GLib.message ("Error: "+e.message);
- assert_not_reached ();
- }
});
Test.add_func ("/gxml/gom-serialization/read/property-date", () => {
try {
@@ -551,7 +521,6 @@ class GomSerializationTest : GXmlTest {
}
});
Test.add_func ("/gxml/gom-serialization/write/property-datetime", () => {
- try {
var t = new Taxes ();
string s = t.to_string ();
assert (s != null);
@@ -583,10 +552,6 @@ class GomSerializationTest : GXmlTest {
GLib.message ("DOC:"+s2);
#endif
assert ("Timestamp=\"2023-03-10T15:23:10\"" in s2);
- } catch (GLib.Error e) {
- GLib.message ("Error: "+e.message);
- assert_not_reached ();
- }
});
Test.add_func ("/gxml/gom-serialization/write/property-arraylist", () => {
try {
@@ -773,7 +738,6 @@ class GomSerializationTest : GXmlTest {
}
});
Test.add_func ("/gxml/gom-serialization/write/gom-property", () => {
- try {
var m = new Motor ();
string s = m.to_string ();
assert (s != null);
@@ -857,10 +821,6 @@ class GomSerializationTest : GXmlTest {
assert (m.model.search ("MODEL1"));
m.model.value = "MODEL1";
assert (m.model.is_valid_value ());
- } catch (GLib.Error e) {
- GLib.message ("Error: "+e.message);
- assert_not_reached ();
- }
});
Test.add_func ("/gxml/gom-serialization/read/properties", () => {
try {
diff --git a/test/SerializableGeeArrayListTest.vala b/test/SerializableGeeArrayListTest.vala
index c9b7184..361d854 100644
--- a/test/SerializableGeeArrayListTest.vala
+++ b/test/SerializableGeeArrayListTest.vala
@@ -88,7 +88,6 @@ class SerializableGeeArrayListTest : GXmlTest
{
Test.add_func ("/gxml/serializable/arraylist/api",
() => {
- try {
var c = new SerializableArrayList<AElement> ();
var o1 = new AElement.named ("Big");
var o2 = new AElement.named ("Small");
@@ -108,10 +107,6 @@ class SerializableGeeArrayListTest : GXmlTest
stdout.printf (@"Small is not found\n");
assert_not_reached ();
}
- }
- catch (GLib.Error e) {
- stdout.printf (@"ERROR: $(e.message)");
- }
});
Test.add_func ("/gxml/serializable/arraylist/serialize",
() => {
diff --git a/test/SerializableGeeCollections-TDocument-Test.vala
b/test/SerializableGeeCollections-TDocument-Test.vala
index 91e4f18..28147ff 100644
--- a/test/SerializableGeeCollections-TDocument-Test.vala
+++ b/test/SerializableGeeCollections-TDocument-Test.vala
@@ -31,8 +31,6 @@ class SerializableGeeCollectionsTDocumentTest : GXmlTest
class Citizen : SerializableObjectModel
{
public string ctype { get; set; }
- public string get_value () { return serialized_xml_node_value; }
- public void set_value (string val) { serialized_xml_node_value = val; }
public override bool serialize_use_xml_node_value () { return true; }
public override string to_string () { return @"Citizen: $ctype"; }
public override string node_name () { return "citizen"; }
@@ -43,11 +41,9 @@ class SerializableGeeCollectionsTDocumentTest : GXmlTest
{
public int size { get; set; }
public Asteroid.with_size (int size) { this.size = size; }
- public string get_value () { return serialized_xml_node_value; }
- public void set_value (string val) { serialized_xml_node_value = val; }
public override string to_string () { return @"$size"; }
public override string node_name () { return "asteroid"; }
-
+
public class Array : SerializableArrayList<Asteroid> {}
}
class Planet : SerializableContainer, SerializableMapKey<string>
diff --git a/test/SerializableGeeCollectionsTest.vala b/test/SerializableGeeCollectionsTest.vala
index ee508d2..ef778b2 100644
--- a/test/SerializableGeeCollectionsTest.vala
+++ b/test/SerializableGeeCollectionsTest.vala
@@ -32,8 +32,6 @@ class SerializableGeeCollectionsTest : GXmlTest
class Citizen : SerializableObjectModel
{
public string ctype { get; set; }
- public string get_value () { return serialized_xml_node_value; }
- public void set_value (string val) { serialized_xml_node_value = val; }
//Enable set GElement content
public override bool serialize_use_xml_node_value () { return true; }
public override string to_string () { return @"Citizen: $ctype"; }
@@ -45,11 +43,9 @@ class SerializableGeeCollectionsTest : GXmlTest
{
public int size { get; set; }
public Asteroid.with_size (int size) { this.size = size; }
- public string get_value () { return serialized_xml_node_value; }
- public void set_value (string val) { serialized_xml_node_value = val; }
public override string to_string () { return @"$size"; }
public override string node_name () { return "asteroid"; }
-
+
public class Array : SerializableArrayList<Asteroid> {}
}
class Planet : SerializableContainer, SerializableMapKey<string>
@@ -183,7 +179,6 @@ class SerializableGeeCollectionsTest : GXmlTest
class BallFill : SerializableObjectModel
{
public string name { get; set; default = "Fill"; }
- public void set_text (string txt) { serialized_xml_node_value = txt; }
public override string to_string () { return name; }
public override string node_name () { return "BallFill"; }
public override bool serialize_use_xml_node_value () { return true; }
@@ -430,8 +425,8 @@ class SerializableGeeCollectionsTest : GXmlTest
if (n.name == "ChargeZone") {
foreach (GXml.Node cn in n.children_nodes)
{
- if (n is Text) { if (n.value != "") assert_not_reached (); }
-
+ if (cn is Text) { if (cn.value != "") assert_not_reached (); }
+
}
}
}
diff --git a/test/SerializableGeeHashMapTest.vala b/test/SerializableGeeHashMapTest.vala
index bb4e783..9de176c 100644
--- a/test/SerializableGeeHashMapTest.vala
+++ b/test/SerializableGeeHashMapTest.vala
@@ -104,7 +104,6 @@ class SerializableGeeHashMapTest : GXmlTest
{
Test.add_func ("/gxml/serializable/hashmap/api",
() => {
- try {
var c = new SerializableHashMap<string,Space> ();
var o1 = new Space.named ("Big");
var o2 = new Space.named ("Small");
@@ -137,10 +136,6 @@ class SerializableGeeHashMapTest : GXmlTest
GLib.message (@"Small key value is not found\n");
assert_not_reached ();
}
- }
- catch (GLib.Error e) {
- GLib.message (@"ERROR: $(e.message)");
- }
});
Test.add_func ("/gxml/serializable/hashmap/serialize",
() => {
diff --git a/test/TDocumentTest.vala b/test/TDocumentTest.vala
index 6f211cf..e7efa09 100644
--- a/test/TDocumentTest.vala
+++ b/test/TDocumentTest.vala
@@ -31,7 +31,6 @@ class TDocumentTest : GXmlTest {
}
public static void add_tests () {
Test.add_func ("/gxml/t-document", () => {
- try {
var d = new TDocument ();
assert (d.name == "#document");
assert (d.root == null);
@@ -39,13 +38,6 @@ class TDocumentTest : GXmlTest {
assert (d.attrs != null);
assert (d.children_nodes.size == 0);
assert (d.value == null);
- }
- catch (GLib.Error e) {
-#if DEBUG
- GLib.message (@"ERROR: $(e.message)");
-#endif
- assert_not_reached ();
- }
});
Test.add_func ("/gxml/t-document/root", () => {
try {
@@ -418,7 +410,6 @@ class TDocumentTest : GXmlTest {
assert (c.attrs.size == 1);
var pt = c.attrs.get ("gxml:prop");
assert (pt != null);
- var pt2 = (c as Element).get_ns_attr ("prop", doc.namespaces[0].uri);
str = doc.to_string ().split("\n");
assert (str[1] == "<root
xmlns:gxml=\"http://www.gnome.org/GXml\";><gxml2:child xmlns:gxml2=\"http://www.gnome.org/GXml2\";
gxml:prop=\"Ten\"/></root>");
} catch (GLib.Error e) {
@@ -499,7 +490,6 @@ class TDocumentTest : GXmlTest {
} catch (GLib.Error e) { GLib.message ("ERROR: "+e.message); assert_not_reached (); }
});
Test.add_func ("/gxml/t-document/read/namespace", () => {
- try {
var f = GLib.File.new_for_path (GXmlTestConfig.TEST_DIR+"/t-read-test.xml");
assert (f.query_exists ());
var d = new TDocument.from_file (f);
@@ -539,10 +529,8 @@ class TDocumentTest : GXmlTest {
assert (bp.namespaces.size == 1);
assert (bp.namespaces[0].prefix == "gxml");
assert (bp.namespaces[0].uri == "http://wiki.gnome.org/GXml";);
- } catch (GLib.Error e) { GLib.message ("ERROR: "+e.message); assert_not_reached (); }
});
Test.add_func ("/gxml/t-document/read/comment", () => {
- try {
var f = GLib.File.new_for_path (GXmlTestConfig.TEST_DIR+"/t-read-test.xml");
assert (f.query_exists ());
var d = new TDocument.from_file (f);
@@ -555,7 +543,6 @@ class TDocumentTest : GXmlTest {
assert (a1.children_nodes[0] is GXml.Comment);
assert (a1.children_nodes[0].value == " Inner comment");
//GLib.message ("Doc:"+d.to_string ());
- } catch (GLib.Error e) { GLib.message ("ERROR: "+e.message); assert_not_reached (); }
});
Test.add_func ("/gxml/t-document/read/pi", () => {
try {
@@ -695,7 +682,6 @@ class TDocumentTest : GXmlTest {
} catch (GLib.Error e) { GLib.message ("ERROR: "+e.message); assert_not_reached (); }
});
Test.add_func ("/gxml/t-document/read/string", () => {
- try {
var f = GLib.File.new_for_path (GXmlTestConfig.TEST_DIR+"/t-read-test.xml");
assert (f.query_exists ());
var d = new TDocument.from_string ("<root><child v=\"1\">TEXT</child><doc
year=\"2016\"><name>COMMUNICATIONS</name></doc></root>");
@@ -712,10 +698,8 @@ class TDocumentTest : GXmlTest {
assert (d.root.children_nodes[1].children_nodes[0].name == "name");
assert (d.root.children_nodes[1].children_nodes[0].children_nodes[0] is
GXml.Text);
assert (d.root.children_nodes[1].children_nodes[0].children_nodes[0].value ==
"COMMUNICATIONS");
- } catch (GLib.Error e) { GLib.message ("ERROR: "+e.message); assert_not_reached (); }
});
Test.add_func ("/gxml/t-document/read/string/attrs", () => {
- try {
var f = GLib.File.new_for_path (GXmlTestConfig.TEST_DIR+"/t-read-test.xml");
assert (f.query_exists ());
var d = new TDocument.from_string ("<root
xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\";><child v=\"1\" xsi:v=\"VType\">TEXT</child><doc
year=\"2016\"><name>COMMUNICATIONS</name></doc></root>");
@@ -737,7 +721,6 @@ class TDocumentTest : GXmlTest {
assert (d.root.children_nodes[1].children_nodes[0].name == "name");
assert (d.root.children_nodes[1].children_nodes[0].children_nodes[0] is
GXml.Text);
assert (d.root.children_nodes[1].children_nodes[0].children_nodes[0].value ==
"COMMUNICATIONS");
- } catch (GLib.Error e) { GLib.message ("ERROR: "+e.message); assert_not_reached (); }
});
Test.add_func ("/gxml/t-document/readtype", () => {
try {
diff --git a/test/gxml-performance.vala b/test/gxml-performance.vala
index 30d7b2d..ae8dac3 100644
--- a/test/gxml-performance.vala
+++ b/test/gxml-performance.vala
@@ -21,7 +21,6 @@ using GXml;
class Name : SerializableObjectModel
{
public string get_name () { return serialized_xml_node_value; }
- public void set_name (string name) { serialized_xml_node_value = name; }
public override bool serialize_use_xml_node_value () { return true; }
public override string to_string () { return serialized_xml_node_value; }
}
@@ -29,7 +28,6 @@ class Name : SerializableObjectModel
class Email : SerializableObjectModel
{
public string get_mail () { return serialized_xml_node_value; }
- public void set_mail (string email) { serialized_xml_node_value = email; }
public override bool serialize_use_xml_node_value () { return true; }
public override string to_string () { return serialized_xml_node_value; }
}
@@ -214,9 +212,9 @@ public class Performance
public static void iterate (GXml.Node node) {
foreach (GXml.Node n in node.children_nodes) {
int i = node.children_nodes.size;
+#if DEBUG
string name = n.name;
string val = n.value;
-#if DEBUG
GLib.message ("Node: "+name+" Val: "+val+ " Children: "+i.to_string ());
#endif
if (i > 0)
@@ -226,9 +224,9 @@ public class Performance
public static void iterate_dom (GXml.DomNode node) {
foreach (GXml.DomNode n in node.child_nodes) {
int i = n.child_nodes.size;
+#if DEBUG
string name = n.node_name;
string val = n.node_value;
-#if DEBUG
GLib.message ("Node: "+name+" Val: "+val+ " Children: "+i.to_string ());
#endif
if (i > 0)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
