diff options
Diffstat (limited to 'cpp/sca/test/store-function')
-rw-r--r-- | cpp/sca/test/store-function/cart.hpp | 16 | ||||
-rw-r--r-- | cpp/sca/test/store-function/catalog.hpp | 10 | ||||
-rw-r--r-- | cpp/sca/test/store-function/currency.hpp | 8 | ||||
-rw-r--r-- | cpp/sca/test/store-function/item.hpp | 2 | ||||
-rw-r--r-- | cpp/sca/test/store-function/store-function-test.cpp | 2 | ||||
-rw-r--r-- | cpp/sca/test/store-function/store-ui.hpp | 24 |
6 files changed, 31 insertions, 31 deletions
diff --git a/cpp/sca/test/store-function/cart.hpp b/cpp/sca/test/store-function/cart.hpp index c21e509487..f3b0f6195e 100644 --- a/cpp/sca/test/store-function/cart.hpp +++ b/cpp/sca/test/store-function/cart.hpp @@ -55,14 +55,14 @@ const double shoppingCart_getTotal() { } const tuscany::value shoppingCart_service(const tuscany::list<tuscany::value>& args) { - if (car(args) == tuscany::value("getAll")) - return tuscany::value(shoppingCart_getAll()); - if (car(args) == tuscany::value("post")) - return tuscany::value(shoppingCart_post(cadr(args))); - if (car(args) == tuscany::value("deleteAll")) - return tuscany::value(shoppingCart_deleteAll()); - if (car(args) == tuscany::value("getTotal")) - return tuscany::value(shoppingCart_getTotal()); + if (car(args) == "getAll") + return shoppingCart_getAll(); + if (car(args) == "post") + return shoppingCart_post(cadr(args)); + if (car(args) == "deleteAll") + return shoppingCart_deleteAll(); + if (car(args) == "getTotal") + return shoppingCart_getTotal(); return tuscany::value(); } diff --git a/cpp/sca/test/store-function/catalog.hpp b/cpp/sca/test/store-function/catalog.hpp index 82a69e2bbd..7bf54231a7 100644 --- a/cpp/sca/test/store-function/catalog.hpp +++ b/cpp/sca/test/store-function/catalog.hpp @@ -33,20 +33,20 @@ namespace store std::string catalog_currencyCode = "USD"; double catalog_convert(const service& currencyConverter, const double price) { - return currencyConverter(makeList(tuscany::value("convert"), tuscany::value("USD"), tuscany::value(catalog_currencyCode), tuscany::value(price))); + return currencyConverter(tuscany::makeList<tuscany::value>("convert", "USD", catalog_currencyCode, price)); } const tuscany::list<ItemType> catalog_get(const service& currencyConverter) { - const std::string currencySymbol = currencyConverter_service(makeList(tuscany::value("getSymbol"), tuscany::value(catalog_currencyCode))); - return makeList( + const std::string currencySymbol = currencyConverter_service(tuscany::makeList<tuscany::value>("getSymbol", catalog_currencyCode)); + return tuscany::makeList( makeItem("Apple", catalog_currencyCode, currencySymbol, catalog_convert(currencyConverter, 2.99)), makeItem("Orange", catalog_currencyCode, currencySymbol, catalog_convert(currencyConverter, 3.55)), makeItem("Pear", catalog_currencyCode, currencySymbol, catalog_convert(currencyConverter, 1.55))); } const tuscany::value catalog_service(const service& currencyConverter, const tuscany::list<tuscany::value>& args) { - if (car(args) == tuscany::value("get")) - return tuscany::value(catalog_get(currencyConverter)); + if (car(args) == "get") + return catalog_get(currencyConverter); return tuscany::value(); } diff --git a/cpp/sca/test/store-function/currency.hpp b/cpp/sca/test/store-function/currency.hpp index ce7e4f464b..453a5e1e81 100644 --- a/cpp/sca/test/store-function/currency.hpp +++ b/cpp/sca/test/store-function/currency.hpp @@ -47,10 +47,10 @@ const std::string currencyConverter_getSymbol(const std::string& currencyCode) { } const tuscany::value currencyConverter_service(const tuscany::list<tuscany::value>& args) { - if (car(args) == tuscany::value("convert")) - return tuscany::value(currencyConverter_convert(cadr(args), car(cdr(cdr(args))), car(cdr(cdr(cdr(args)))))); - if (car(args) == tuscany::value("getSymbol")) - return tuscany::value(currencyConverter_getSymbol(cadr(args))); + if (car(args) == "convert") + return currencyConverter_convert(cadr(args), car(cdr(cdr(args))), car(cdr(cdr(cdr(args))))); + if (car(args) == "getSymbol") + return currencyConverter_getSymbol(cadr(args)); return tuscany::value(); } diff --git a/cpp/sca/test/store-function/item.hpp b/cpp/sca/test/store-function/item.hpp index 8a121124a3..40d18b4ce1 100644 --- a/cpp/sca/test/store-function/item.hpp +++ b/cpp/sca/test/store-function/item.hpp @@ -31,7 +31,7 @@ namespace store typedef tuscany::value ItemType; const ItemType makeItem(const std::string& name, const std::string& currencyCode, const std::string& currencySymbol, const double price) { - return tuscany::value(makeList(tuscany::value(name), tuscany::value(currencyCode), tuscany::value(currencySymbol), tuscany::value(price))); + return tuscany::makeList<tuscany::value>(name, currencyCode, currencySymbol, price); } const std::string itemName(const ItemType& item) { diff --git a/cpp/sca/test/store-function/store-function-test.cpp b/cpp/sca/test/store-function/store-function-test.cpp index e71ecfd633..604b33acff 100644 --- a/cpp/sca/test/store-function/store-function-test.cpp +++ b/cpp/sca/test/store-function/store-function-test.cpp @@ -33,7 +33,7 @@ namespace store bool testComponentAssembly() { const service store(storeSolution_service); - assert(length((tuscany::list<tuscany::value>)store(makeList(tuscany::value("getCatalog")))) == 3); + assert(length((tuscany::list<tuscany::value>)store(tuscany::makeList<tuscany::value>("getCatalog"))) == 3); return true; } diff --git a/cpp/sca/test/store-function/store-ui.hpp b/cpp/sca/test/store-function/store-ui.hpp index 9b100a6793..a2748547d5 100644 --- a/cpp/sca/test/store-function/store-ui.hpp +++ b/cpp/sca/test/store-function/store-ui.hpp @@ -33,30 +33,30 @@ namespace store { const tuscany::list<ItemType> storeUI_getCatalog(const service& catalog) { - return catalog(makeList(tuscany::value("get"))); + return catalog(tuscany::makeList<tuscany::value>("get")); } const tuscany::list<ItemType> storeUI_getCart(const service& cart) { - return cart(makeList(tuscany::value("getAll"))); + return cart(tuscany::makeList<tuscany::value>("getAll")); } const double storeUI_getTotal(const service& cart) { - return cart(makeList(tuscany::value("getTotal"))); + return cart(tuscany::makeList<tuscany::value>("getTotal")); } const bool storeUI_post(const service& cart, const ItemType& item) { - return cart(makeList(tuscany::value("post"), tuscany::value(item))); + return cart(tuscany::makeList<tuscany::value>("post", item)); } const tuscany::value storeUI_service(const service& catalog, const service& cart, const tuscany::list<tuscany::value>& args) { - if (car(args) == tuscany::value("getCatalog")) - return tuscany::value(storeUI_getCatalog(catalog)); - if (car(args) == tuscany::value("getCart")) - return tuscany::value(storeUI_getCart(cart)); - if (car(args) == tuscany::value("getTotal")) - return tuscany::value(storeUI_getTotal(cart)); - if (car(args) == tuscany::value("post")) - return tuscany::value(storeUI_post(cart, cadr(args))); + if (car(args) == "getCatalog") + return storeUI_getCatalog(catalog); + if (car(args) == "getCart") + return storeUI_getCart(cart); + if (car(args) == "getTotal") + return storeUI_getTotal(cart); + if (car(args) == "post") + return storeUI_post(cart, cadr(args)); return tuscany::value(); } |