From 157ca678dee75e7881a0198425d0c8328f0bee04 Mon Sep 17 00:00:00 2001 From: jsdelfino Date: Thu, 3 Jan 2013 07:41:02 +0000 Subject: Improve handling of nested lists, trees, null and floating point values. git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@1428191 13f79535-47bb-0310-9956-ffa450edef68 --- sca-cpp/trunk/modules/scdl/scdl-test.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'sca-cpp/trunk/modules/scdl/scdl-test.cpp') diff --git a/sca-cpp/trunk/modules/scdl/scdl-test.cpp b/sca-cpp/trunk/modules/scdl/scdl-test.cpp index 9daacb5559..2c098d3c53 100644 --- a/sca-cpp/trunk/modules/scdl/scdl-test.cpp +++ b/sca-cpp/trunk/modules/scdl/scdl-test.cpp @@ -53,8 +53,8 @@ const bool testComponents() { const value catalog = named(string("Catalog"), c); assert(name(catalog) == string("Catalog")); - const list t = mkbtree(sort(nameToElementAssoc(c))); - assert(assoctree("Catalog", t) == mklist("Catalog" , cadr(c))); + const list t = mkrbtree(sort(nameToElementAssoc(c))); + assert(rbtreeAssoc("Catalog", t) == mklist("Catalog" , cadr(c))); return true; } @@ -89,8 +89,8 @@ const bool testReferences() { assert(uri(binding) == nilValue); assert(bindingType(binding) == "binding.jsonrpc"); - const list t = mkbtree(sort(referenceToTargetAssoc(references(store)))); - assert(assoctree("shoppingCart", t) == mklist(string("shoppingCart"), string("ShoppingCart/Cart"))); + const list t = mkrbtree(sort(referenceToTargetAssoc(references(store)))); + assert(rbtreeAssoc("shoppingCart", t) == mklist(string("shoppingCart"), string("ShoppingCart/Cart"))); return true; } -- cgit v1.2.3