Minor fixes to server and python evaluator to get python store working. Some changes to python and scheme store test cases to simplify them a bit and make them consistent. Enabled a few more server test combinations.

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

8 files changed, 13 insertions, 43 deletions

diff --git a/sca-cpp/trunk/test/store-scheme/Makefile.am b/sca-cpp/trunk/test/store-scheme/Makefile.am
index fc6a1f88fb..19b2640f3b 100644
--- a/sca-cpp/trunk/test/store-scheme/Makefile.am
+++ b/sca-cpp/trunk/test/store-scheme/Makefile.am
@@ -15,12 +15,12 @@
 #  specific language governing permissions and limitations
 #  under the License.
 
-noinst_PROGRAMS = store-script-test
+noinst_PROGRAMS = script-test
 
 INCLUDES = -I. -I$(top_builddir)/kernel -I${LIBXML2_INCLUDE} -I${APR_INCLUDE} -I${JS_INCLUDE}
 
-store_script_test_SOURCES = store-script-test.cpp
-store_script_test_LDADD = -L${LIBXML2_LIB} -lxml2 -L${APR_LIB} -lapr-1 -laprutil-1 -L${JS_LIB} -lmozjs
-	
-TESTS = store-script-test store-composite-test
+script_test_SOURCES = script-test.cpp
+script_test_LDADD = -L${LIBXML2_LIB} -lxml2 -L${APR_LIB} -lapr-1 -laprutil-1 -L${JS_LIB} -lmozjs
+
+TESTS = script-test server-test
 
diff --git a/sca-cpp/trunk/test/store-scheme/fruits-catalog.scm b/sca-cpp/trunk/test/store-scheme/fruits-catalog.scm
index 18128f0137..173bcbe9c0 100644
--- a/sca-cpp/trunk/test/store-scheme/fruits-catalog.scm
+++ b/sca-cpp/trunk/test/store-scheme/fruits-catalog.scm
@@ -12,6 +12,5 @@
 )
 
 ; TODO remove these JSON-RPC specific functions
-(define (system.listMethods converter) (list "Service.get"))
-(define Service.get get)
+(define (listMethods converter) (list "Service.get"))
 
diff --git a/sca-cpp/trunk/test/store-scheme/htdocs/store.html b/sca-cpp/trunk/test/store-scheme/htdocs/store.html
index f8c6027abe..21eabca7a7 100644
--- a/sca-cpp/trunk/test/store-scheme/htdocs/store.html
+++ b/sca-cpp/trunk/test/store-scheme/htdocs/store.html
@@ -51,7 +51,7 @@
 		catalogItems = items;

 

 		// TEMP		

-		shoppingTotal.getTotal(shoppingTotal_getTotalResponse);

+		shoppingTotal.gettotal(shoppingTotal_getTotalResponse);

 	}

 	

 	function shoppingCart_getResponse(feed) {

@@ -68,7 +68,7 @@
 

 			if (entries.length != 0) {			

 					try	{

-						shoppingTotal.getTotal(shoppingTotal_getTotalResponse);

+						shoppingTotal.gettotal(shoppingTotal_getTotalResponse);

 					}

 					catch(e){

 						alert(e);

diff --git a/sca-cpp/trunk/test/store-scheme/store-script-test.cpp b/sca-cpp/trunk/test/store-scheme/script-test.cpp
index fe2a64e57f..c8eecb65c3 100644
--- a/sca-cpp/trunk/test/store-scheme/store-script-test.cpp
+++ b/sca-cpp/trunk/test/store-scheme/script-test.cpp
@@ -39,7 +39,7 @@ using namespace tuscany;
 bool testScript() {
     gc_scoped_pool pool;
 
-    ifstream is("store-script-test.scm");
+    ifstream is("script-test.scm");
     ostringstream os;
     scheme::evalDriverRun(is, os);
     assert(contains(str(os), "(\"Sample Feed\" \""));
@@ -52,7 +52,7 @@ bool testScript() {
 bool testEval() {
     {
         gc_scoped_pool pool;
-        ifstream is("store-script-test.scm");
+        ifstream is("script-test.scm");
         ostringstream os;
         scheme::setupDisplay(os);
         scheme::Env globalEnv = scheme::setupEnvironment();
@@ -66,7 +66,7 @@ bool testEval() {
 
     {
         gc_scoped_pool pool;
-        ifstream is("store-script-test.scm");
+        ifstream is("script-test.scm");
         ostringstream os;
         scheme::setupDisplay(os);
 
diff --git a/sca-cpp/trunk/test/store-scheme/store-script-test.scm b/sca-cpp/trunk/test/store-scheme/script-test.scm
index 30c10d8184..711656019a 100644
--- a/sca-cpp/trunk/test/store-scheme/store-script-test.scm
+++ b/sca-cpp/trunk/test/store-scheme/script-test.scm
@@ -121,29 +121,3 @@
 (display (storeui_service "getall" added2))
 (display (storeui_service "gettotal"))
 
-; Store UI JSON-RPC interop test case
-
-(define (system.listMethods) (list "Service.get" "Service.getTotal"))
-
-(define (Service.get) (storeui_service "getcatalog"))
-
-(define (.get) (storeui_service "getcatalog"))
-
-(define (Service.getTotal) (storeui_service "gettotal"))
-
-; Store UI ATOMPub interop test case
-
-(define (getall) (storeui_service "getall" added2))
-
-(define (get id) (storeui_service "getentry" id))
-
-(define (post entry)
-  (display entry)
-  (uuid)
-)
-
-(define (delete id)
-  (display id)
-  true
-)
-
diff --git a/sca-cpp/trunk/test/store-scheme/store-composite-test b/sca-cpp/trunk/test/store-scheme/server-test
index b41c4e5393..b41c4e5393 100755
--- a/sca-cpp/trunk/test/store-scheme/store-composite-test
+++ b/sca-cpp/trunk/test/store-scheme/server-test
diff --git a/sca-cpp/trunk/test/store-scheme/shopping-cart.scm b/sca-cpp/trunk/test/store-scheme/shopping-cart.scm
index 60981411c7..77a98c9fd7 100644
--- a/sca-cpp/trunk/test/store-scheme/shopping-cart.scm
+++ b/sca-cpp/trunk/test/store-scheme/shopping-cart.scm
@@ -68,6 +68,5 @@
 )
 
 ; TODO remove these JSON-RPC specific functions
-(define (system.listMethods cache) (list "Service.getTotal"))
-(define Service.getTotal gettotal)
+(define (listMethods cache) (list "Service.gettotal"))
 
diff --git a/sca-cpp/trunk/test/store-scheme/store.scm b/sca-cpp/trunk/test/store-scheme/store.scm
index e325a65d74..0091af542d 100644
--- a/sca-cpp/trunk/test/store-scheme/store.scm
+++ b/sca-cpp/trunk/test/store-scheme/store.scm
@@ -29,7 +29,5 @@
 )
 
 ; TODO remove these JSON-RPC specific functions
-(define (system.listMethods catalog shoppingCart shoppingTotal) (list "Service.get" "Service.getTotal"))
-(define Service.getCatalog getcatalog)
-(define Service.getTotal gettotal)
+(define (listMethods catalog shoppingCart shoppingTotal) (list "Service.getcatalog" "Service.gettotal"))