diff options
Diffstat (limited to '')
| -rw-r--r-- | cpp/sca/modules/json/json-test.cpp | 57 |
1 files changed, 42 insertions, 15 deletions
diff --git a/cpp/sca/modules/json/json-test.cpp b/cpp/sca/modules/json/json-test.cpp index b7cc4e4eeb..bf0ecab1f4 100644 --- a/cpp/sca/modules/json/json-test.cpp +++ b/cpp/sca/modules/json/json-test.cpp @@ -31,6 +31,7 @@ #include "json.hpp" namespace tuscany { +namespace json { bool testJSEval() { JSONContext cx; @@ -56,49 +57,75 @@ bool testJSON() { const list<value> cr = mklist<value>(mklist<value> (attribute, "name", std::string("jdoe")), cons<value>(element, cons<value>("address", ad)), cons<value>(element, cons<value>("account", ac))); const list<value> c = mklist<value>(cons<value>(element, cons<value>("customer", cr))); std::ostringstream os; - writeJSON<std::ostringstream*>(cx, jsonWriter, &os, c); + write<std::ostringstream*>(cx, jsonWriter, &os, c); assert(os.str() == "{\"customer\":{\"name\":\"jdoe\",\"address\":{\"city\":\"san francisco\",\"state\":\"ca\"},\"account\":{\"id\":\"1234\",\"balance\":1000}}}"); } { const list<value> phones = mklist<value> (std::string("408-1234"), std::string("650-1234")); - const list<value> l = mklist<value> (mklist<value> (element, "phones", phones), mklist<value> (attribute, "lastName", std::string("test\ttab")), mklist<value> (attribute, "firstName", std::string("test1"))); + const list<value> l = mklist<value> (mklist<value> (element, "phones", phones), mklist<value> (element, "lastName", std::string("test\ttab")), mklist<value> (element, "firstName", std::string("test1"))); std::ostringstream os; - writeJSON<std::ostringstream*>(cx, jsonWriter, &os, l); + write<std::ostringstream*>(cx, jsonWriter, &os, l); assert(os.str() == "{\"phones\":[\"408-1234\",\"650-1234\"],\"lastName\":\"test\\u0009tab\",\"firstName\":\"test1\"}"); std::istringstream is(os.str()); const list<std::string> il = streamList(is); - const list<value> r = readJSON(cx, il); + const list<value> r = read(cx, il); assert(r == l); std::ostringstream wos; - write(writeJSON(cx, r), wos); + write(write(cx, r), wos); assert(wos.str() == os.str()); } return true; } bool testJSONRPC() { - const std::string lm("{\"id\": 1, \"method\": \"system.listMethods\", \"params\": []}"); JSONContext cx; - const list<value> e = readJSON(cx, mklist(lm)); - const list<value> v = elementsToValues(e); - - assert(assoc<value>("id", v) == mklist<value>("id", 1)); - assert(assoc<value>("method", v) == mklist<value>("method", std::string("system.listMethods"))); - assert(assoc<value>("params", v) == mklist<value>("params", list<value>())); + { + const std::string lm("{\"id\": 1, \"method\": \"system.listMethods\", \"params\": []}"); + const list<value> e = read(cx, mklist(lm)); + const list<value> v = elementsToValues(e); + assert(assoc<value>("id", v) == mklist<value>("id", 1)); + assert(assoc<value>("method", v) == mklist<value>("method", std::string("system.listMethods"))); + assert(assoc<value>("params", v) == mklist<value>("params", list<value>())); + } + { + const std::string i("{\"id\":3,\"result\":[{\"price\":\"$2.99\",\"name\":\"Apple\"},{\"price\":\"$3.55\",\"name\":\"Orange\"},{\"price\":\"$1.55\",\"name\":\"Pear\"}]}"); + const list<value> e = read(cx, mklist(i)); + const std::string i2("{\"id\":3,\"result\":{\"0\":{\"price\":\"$2.99\",\"name\":\"Apple\"},\"1\":{\"price\":\"$3.55\",\"name\":\"Orange\"},\"2\":{\"price\":\"$1.55\",\"name\":\"Pear\"}}}"); + const list<value> e2 = read(cx, mklist(i)); + assert(e == e2); + } + { + const std::string i("{\"id\":3,\"result\":[{\"price\":\"$2.99\",\"name\":\"Apple\"},{\"price\":\"$3.55\",\"name\":\"Orange\"},{\"price\":\"$1.55\",\"name\":\"Pear\"}]}"); + const list<value> e = read(cx, mklist(i)); + std::ostringstream os; + write(write(cx, e), os); + assert(os.str() == i); + const list<value> v = elementsToValues(e); + const list<value> r = valuesToElements(v); + assert(r == e); + } + { + const list<value> r = mklist<value>(mklist<value>("id", 1), mklist<value>("result", mklist<value>(std::string("Service.get"), std::string("Service.getTotal")))); + const list<value> e = valuesToElements(r); + std::ostringstream os; + write(write(cx, e), os); + assert(os.str() == "{\"id\":1,\"result\":[\"Service.get\",\"Service.getTotal\"]}"); + } return true; } } +} int main() { std::cout << "Testing..." << std::endl; - tuscany::testJSEval(); - tuscany::testJSON(); - tuscany::testJSONRPC(); + tuscany::json::testJSEval(); + tuscany::json::testJSON(); + tuscany::json::testJSONRPC(); std::cout << "OK" << std::endl; |