diff options
Diffstat (limited to '')
-rw-r--r-- | cpp/sca/test/store-function/Makefile.am | 28 | ||||
-rw-r--r-- | cpp/sca/test/store-function/cart.hpp (renamed from cpp/sca/samples/store2/cart.hpp) | 16 | ||||
-rw-r--r-- | cpp/sca/test/store-function/catalog.hpp (renamed from cpp/sca/samples/store2/catalog.hpp) | 4 | ||||
-rw-r--r-- | cpp/sca/test/store-function/catalogs.composite (renamed from cpp/sca/samples/store/catalogs.composite) | 0 | ||||
-rw-r--r-- | cpp/sca/test/store-function/currency-composite.hpp (renamed from cpp/sca/samples/store2/currency-composite.hpp) | 0 | ||||
-rw-r--r-- | cpp/sca/test/store-function/currency.composite (renamed from cpp/sca/samples/store/currency.composite) | 0 | ||||
-rw-r--r-- | cpp/sca/test/store-function/currency.hpp (renamed from cpp/sca/samples/store2/currency.hpp) | 8 | ||||
-rw-r--r-- | cpp/sca/test/store-function/item.hpp (renamed from cpp/sca/samples/store2/item.hpp) | 0 | ||||
-rw-r--r-- | cpp/sca/test/store-function/service.hpp (renamed from cpp/sca/samples/store2/service.hpp) | 0 | ||||
-rw-r--r-- | cpp/sca/test/store-function/store-composite.hpp (renamed from cpp/sca/samples/store2/store-composite.hpp) | 0 | ||||
-rw-r--r-- | cpp/sca/test/store-function/store-function-test.cpp (renamed from cpp/sca/samples/store2/store2-test.cpp) | 0 | ||||
-rw-r--r-- | cpp/sca/test/store-function/store-solution.hpp (renamed from cpp/sca/samples/store2/store-solution.hpp) | 0 | ||||
-rw-r--r-- | cpp/sca/test/store-function/store-ui.hpp (renamed from cpp/sca/samples/store2/store-ui.hpp) | 16 | ||||
-rw-r--r-- | cpp/sca/test/store-function/store.composite (renamed from cpp/sca/samples/store/store.composite) | 0 |
14 files changed, 50 insertions, 22 deletions
diff --git a/cpp/sca/test/store-function/Makefile.am b/cpp/sca/test/store-function/Makefile.am new file mode 100644 index 0000000000..b63381c0cf --- /dev/null +++ b/cpp/sca/test/store-function/Makefile.am @@ -0,0 +1,28 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# http://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. + +store_function_PROGRAMS = store-function-test +store_functiondir=$(prefix)/test/store-function/deploy + +INCLUDES = -I. -I$(top_builddir)/kernel -I${LIBXML2_INCLUDE} + +store_function_test_SOURCES = store-function-test.cpp +store_function_test_LDADD = -L${LIBXML2_LIB} -lxml2 -lpthread + +EXTRA_DIST = *.composite +store_function_DATA = *.composite + diff --git a/cpp/sca/samples/store2/cart.hpp b/cpp/sca/test/store-function/cart.hpp index f3b0f6195e..c21e509487 100644 --- a/cpp/sca/samples/store2/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) == "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(); + 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()); return tuscany::value(); } diff --git a/cpp/sca/samples/store2/catalog.hpp b/cpp/sca/test/store-function/catalog.hpp index 82a2a458a9..82a69e2bbd 100644 --- a/cpp/sca/samples/store2/catalog.hpp +++ b/cpp/sca/test/store-function/catalog.hpp @@ -45,8 +45,8 @@ const tuscany::list<ItemType> catalog_get(const service& currencyConverter) { } const tuscany::value catalog_service(const service& currencyConverter, const tuscany::list<tuscany::value>& args) { - if (car(args) == "get") - return catalog_get(currencyConverter); + if (car(args) == tuscany::value("get")) + return tuscany::value(catalog_get(currencyConverter)); return tuscany::value(); } diff --git a/cpp/sca/samples/store/catalogs.composite b/cpp/sca/test/store-function/catalogs.composite index 1638ed0a05..1638ed0a05 100644 --- a/cpp/sca/samples/store/catalogs.composite +++ b/cpp/sca/test/store-function/catalogs.composite diff --git a/cpp/sca/samples/store2/currency-composite.hpp b/cpp/sca/test/store-function/currency-composite.hpp index ae28471538..ae28471538 100644 --- a/cpp/sca/samples/store2/currency-composite.hpp +++ b/cpp/sca/test/store-function/currency-composite.hpp diff --git a/cpp/sca/samples/store/currency.composite b/cpp/sca/test/store-function/currency.composite index aefd474f1f..aefd474f1f 100644 --- a/cpp/sca/samples/store/currency.composite +++ b/cpp/sca/test/store-function/currency.composite diff --git a/cpp/sca/samples/store2/currency.hpp b/cpp/sca/test/store-function/currency.hpp index 453a5e1e81..ce7e4f464b 100644 --- a/cpp/sca/samples/store2/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) == "convert") - return currencyConverter_convert(cadr(args), car(cdr(cdr(args))), car(cdr(cdr(cdr(args))))); - if (car(args) == "getSymbol") - return currencyConverter_getSymbol(cadr(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))); return tuscany::value(); } diff --git a/cpp/sca/samples/store2/item.hpp b/cpp/sca/test/store-function/item.hpp index 8a121124a3..8a121124a3 100644 --- a/cpp/sca/samples/store2/item.hpp +++ b/cpp/sca/test/store-function/item.hpp diff --git a/cpp/sca/samples/store2/service.hpp b/cpp/sca/test/store-function/service.hpp index b764e87d1a..b764e87d1a 100644 --- a/cpp/sca/samples/store2/service.hpp +++ b/cpp/sca/test/store-function/service.hpp diff --git a/cpp/sca/samples/store2/store-composite.hpp b/cpp/sca/test/store-function/store-composite.hpp index 351c905eae..351c905eae 100644 --- a/cpp/sca/samples/store2/store-composite.hpp +++ b/cpp/sca/test/store-function/store-composite.hpp diff --git a/cpp/sca/samples/store2/store2-test.cpp b/cpp/sca/test/store-function/store-function-test.cpp index e71ecfd633..e71ecfd633 100644 --- a/cpp/sca/samples/store2/store2-test.cpp +++ b/cpp/sca/test/store-function/store-function-test.cpp diff --git a/cpp/sca/samples/store2/store-solution.hpp b/cpp/sca/test/store-function/store-solution.hpp index e0addcba12..e0addcba12 100644 --- a/cpp/sca/samples/store2/store-solution.hpp +++ b/cpp/sca/test/store-function/store-solution.hpp diff --git a/cpp/sca/samples/store2/store-ui.hpp b/cpp/sca/test/store-function/store-ui.hpp index 3be7480339..9b100a6793 100644 --- a/cpp/sca/samples/store2/store-ui.hpp +++ b/cpp/sca/test/store-function/store-ui.hpp @@ -49,14 +49,14 @@ const bool storeUI_post(const service& cart, const ItemType& item) { } const tuscany::value storeUI_service(const service& catalog, const service& cart, const tuscany::list<tuscany::value>& 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)); + 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))); return tuscany::value(); } diff --git a/cpp/sca/samples/store/store.composite b/cpp/sca/test/store-function/store.composite index 124adff853..124adff853 100644 --- a/cpp/sca/samples/store/store.composite +++ b/cpp/sca/test/store-function/store.composite |