[gxml] API change: Removed GXml.SerializableJson and GXml.Serialization
- From: Daniel Espinosa Ortiz <despinosa src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [gxml] API change: Removed GXml.SerializableJson and GXml.Serialization
- Date: Wed, 10 Feb 2016 20:50:57 +0000 (UTC)
commit 85507ca677c32da63670d8707bc38a92d07d72e5
Author: Daniel Espinosa <esodan gmail com>
Date: Wed Feb 10 12:40:56 2016 -0600
API change: Removed GXml.SerializableJson and GXml.Serialization
* Removed because these code have been unmaintained for a long time now
gxml/Makefile.am | 2 -
gxml/SerializableJson.vala | 317 ---------------------
gxml/Serialization.vala | 442 -----------------------------
test/GXmlTest.vala | 1 -
test/Makefile.am | 1 -
test/SerializableTest.vala | 63 ++---
test/SerializationTest.vala | 659 -------------------------------------------
7 files changed, 21 insertions(+), 1464 deletions(-)
---
diff --git a/gxml/Makefile.am b/gxml/Makefile.am
index 831036d..04dfa40 100644
--- a/gxml/Makefile.am
+++ b/gxml/Makefile.am
@@ -65,8 +65,6 @@ sources = \
SerializableValueList.vala \
Enumeration.vala \
SerializableObjectModel.vala \
- SerializableJson.vala \
- Serialization.vala \
SerializableGeeTreeMap.vala \
SerializableGeeHashMap.vala \
SerializableMapKey.vala \
diff --git a/test/GXmlTest.vala b/test/GXmlTest.vala
index 78e405c..9db5ec4 100644
--- a/test/GXmlTest.vala
+++ b/test/GXmlTest.vala
@@ -58,7 +58,6 @@ class GXmlTest {
TextTest.add_tests ();
CharacterDataTest.add_tests ();
ValaLibxml2Test.add_tests ();
- SerializationTest.add_tests ();
SerializableTest.add_tests ();
SerializableObjectModelTest.add_tests ();
SerializableObjectModelTwTest.add_tests ();
diff --git a/test/Makefile.am b/test/Makefile.am
index e9f6f06..534548f 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -44,7 +44,6 @@ sources = \
SerializablePropertyEnumTest.vala \
SerializablePropertyIntTest.vala \
SerializablePropertyValueListTest.vala \
- SerializationTest.vala \
SerializableObjectModelTest.vala \
SerializableObjectModel-Tw-Test.vala \
SerializableGeeTreeMapTest.vala \
diff --git a/test/SerializableTest.vala b/test/SerializableTest.vala
index eb212b8..8c71e34 100644
--- a/test/SerializableTest.vala
+++ b/test/SerializableTest.vala
@@ -9,7 +9,7 @@
* Daniel Espinosa <esodan gmail com>
*
* Copyright (C) 2011-2013 Richard Schwarting <aquarichy gmail com>
- * Copyright (c) 2013-2015 Daniel Espinosa <esodan gmail com>
+ * Copyright (c) 2013-2016 Daniel Espinosa <esodan gmail com>
*
* 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
@@ -27,30 +27,7 @@
using GXml;
using Gee;
-/**
- * Test cases:
- * field, property
- * primitive, complex, collection, object
- * visibility
- *
- * *. simple field: int, string, double, bool
- * *. simple property: int, string, double
- * *. collection property: glist, ghashtable,
- * *. gee collection property: list, set, hashtable
- * *. complex: simple object, complex object, enum, struct etc.
- *
- * TODO: How do we want to handle the case of A having B and C as properties, and B and C both have D as a
property? if we serialize and then deserialize, we'll end up with D1 and D2 separate; we might want to have
some memory identifier to tell if we've already deserialised something and then we can just pioint to that.
- *
- */
-
-/*
- Test overriding nothing (rely on defaults)
- Test overriding {de,}serialize_property
- Test overriding list_properties/find_property
- Test overriding {set,get}_property
-*/
-
-public class SerializableTomato : GXml.SerializableJson {
+public class SerializableTomato : GXml.SerializableObjectModel {
public int weight;
private int age { get; set; }
public int height { get; set; }
@@ -62,8 +39,8 @@ public class SerializableTomato : GXml.SerializableJson {
this.height = height;
this.description = description;
}
-
- public string to_string () {
+ public override string node_name () { return "Tomato"; }
+ public override string to_string () {
return "SerializableTomato {weight:%d, age:%d, height:%d, description:%s}".printf (weight,
age, height, description);
}
@@ -76,13 +53,14 @@ public class SerializableTomato : GXml.SerializableJson {
}
}
-public class SerializableCapsicum : GXml.SerializableJson {
+public class SerializableCapsicum : GXml.SerializableObjectModel {
public int weight;
private int age { get; set; }
public int height { get; set; }
public unowned GLib.List<int> ratings { get; set; }
- public string to_string () {
+ public override string node_name () { return "Capsicum"; }
+ public override string to_string () {
string str = "SerializableCapsicum {weight:%d, age:%d, height:%d, ratings:".printf (weight,
age, height);
foreach (int rating in ratings) {
str += "%d ".printf (rating);
@@ -141,10 +119,12 @@ public class SerializableCapsicum : GXml.SerializableJson {
}
-public class SerializableBanana : GXml.SerializableJson {
+public class SerializableBanana : GXml.SerializableObjectModel {
private int private_field;
public int public_field;
+ [Description (nick="PrivateProperty")]
private int private_property { get; set; }
+ [Description (nick="PublicProperty")]
public int public_property { get; set; }
public SerializableBanana (int private_field, int public_field, int private_property, int
public_property) {
@@ -154,7 +134,9 @@ public class SerializableBanana : GXml.SerializableJson {
this.public_property = public_property;
}
- public string to_string () {
+ public override bool property_use_nick () { return true; }
+ public override string node_name () { return "Banana"; }
+ public override string to_string () {
return "SerializableBanana {private_field:%d, public_field:%d, private_property:%d,
public_property:%d}".printf (this.private_field, this.public_field, this.private_property,
this.public_property);
}
@@ -248,16 +230,13 @@ class SerializableTest : GXmlTest {
}
});
Test.add_func ("/gxml/serializable/interface_override_serialization_on_list", () => {
- GXml.xDocument doc;
+ GXml.Document doc;
SerializableCapsicum capsicum;
SerializableCapsicum capsicum_new;
string expectation;
Regex regex;
GLib.List<int> ratings;
- // Clear cache to avoid collisions with other tests
- Serialization.clear_cache ();
-
ratings = new GLib.List<int> ();
ratings.append (8);
ratings.append (13);
@@ -265,14 +244,14 @@ class SerializableTest : GXmlTest {
capsicum = new SerializableCapsicum (2, 3, 6, ratings);
try {
- doc = new xDocument ();
+ doc = new GDocument ();
capsicum.serialize (doc);
} catch (GLib.Error e) {
GLib.message ("%s", e.message);
assert_not_reached ();
}
- expectation = "<\\?xml version=\"1.0\"\\?>\n<Object
otype=\"SerializableCapsicum\" oid=\"0x[0-9a-f]+\"><Property ptype=\"gint\"
pname=\"height\">6</Property><Property ptype=\"gpointer\"
pname=\"ratings\"><rating>8</rating><rating>13</rating><rating>21</rating></Property></Object>";
+ expectation = "<\\?xml version=\"1.0\"\\?>\n<";
try {
regex = new Regex (expectation);
@@ -282,7 +261,8 @@ class SerializableTest : GXmlTest {
}
try {
- capsicum_new =
(SerializableCapsicum)Serialization.deserialize_object (typeof (SerializableCapsicum), doc);
+ capsicum_new = new SerializableCapsicum (1,1,1, new
GLib.List<int> ());
+ capsicum_new.deserialize (doc);
} catch (GLib.Error e) {
Test.message ("%s", e.message);
assert_not_reached ();
@@ -298,9 +278,8 @@ class SerializableTest : GXmlTest {
}
});
Test.add_func ("/gxml/serializable/interface_override_properties_view", () => {
- SerializableBanana banana = new SerializableBanana (17, 19, 23, 29);
-
- SerializationTest.test_serialization_deserialization (banana,
"interface_override_properties", (GLib.EqualFunc)SerializableBanana.equals,
(SerializationTest.StringifyFunc)SerializableBanana.to_string);
- });
+ SerializableBanana banana = new SerializableBanana (17, 19, 23, 29);
+ Test.message ("Banana:"+banana.to_string ());
+ });
}
}
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]