Refactored store tests and moved them under test/. Simplified the script evaluation logic a little, added an apply procedure and support for variable lists of args. Added a test case that assembles the store app using a script.

git-svn-id: http://svn.us.apache.org/repos/asf/tuscany@821425 13f79535-47bb-0310-9956-ffa450edef68

1 files changed, 8 insertions, 8 deletions

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();
 }