You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tuscany.apache.org by js...@apache.org on 2010/03/06 10:23:28 UTC
svn commit: r919720 - in /tuscany/sca-cpp/trunk/modules: atom/atom-test.cpp
atom/atom.hpp http/curl.hpp java/client-test.cpp python/client-test.cpp
server/client-test.cpp server/client-test.hpp server/mod-eval.hpp
wsgi/client-test.cpp
Author: jsdelfino
Date: Sat Mar 6 09:23:27 2010
New Revision: 919720
URL: http://svn.apache.org/viewvc?rev=919720&view=rev
Log:
Minor code cleanup, refactored some ATOM data conversion functions, simplified client test cases.
Modified:
tuscany/sca-cpp/trunk/modules/atom/atom-test.cpp
tuscany/sca-cpp/trunk/modules/atom/atom.hpp
tuscany/sca-cpp/trunk/modules/http/curl.hpp
tuscany/sca-cpp/trunk/modules/java/client-test.cpp
tuscany/sca-cpp/trunk/modules/python/client-test.cpp
tuscany/sca-cpp/trunk/modules/server/client-test.cpp
tuscany/sca-cpp/trunk/modules/server/client-test.hpp
tuscany/sca-cpp/trunk/modules/server/mod-eval.hpp
tuscany/sca-cpp/trunk/modules/wsgi/client-test.cpp
Modified: tuscany/sca-cpp/trunk/modules/atom/atom-test.cpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/atom/atom-test.cpp?rev=919720&r1=919719&r2=919720&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/atom/atom-test.cpp (original)
+++ tuscany/sca-cpp/trunk/modules/atom/atom-test.cpp Sat Mar 6 09:23:27 2010
@@ -80,13 +80,13 @@
assert(str(os) == itemEntry);
}
{
- const list<value> a = content(readEntry(mklist(itemEntry)));
+ const list<value> a = content(readATOMEntry(mklist(itemEntry)));
ostringstream os;
writeATOMEntry<ostream*>(writer, &os, a);
assert(str(os) == itemEntry);
}
{
- const list<value> a = content(readEntry(mklist(incompleteEntry)));
+ const list<value> a = content(readATOMEntry(mklist(incompleteEntry)));
ostringstream os;
writeATOMEntry<ostream*>(writer, &os, a);
assert(str(os) == completedEntry);
@@ -133,7 +133,7 @@
assert(str(os) == emptyFeed);
}
{
- const list<value> a = content(readFeed(mklist(emptyFeed)));
+ const list<value> a = content(readATOMFeed(mklist(emptyFeed)));
ostringstream os;
writeATOMFeed<ostream*>(writer, &os, a);
assert(str(os) == emptyFeed);
@@ -169,7 +169,7 @@
assert(str(os) == itemFeed);
}
{
- const list<value> a = content(readFeed(mklist(itemFeed)));
+ const list<value> a = content(readATOMFeed(mklist(itemFeed)));
ostringstream os;
writeATOMFeed<ostream*>(writer, &os, a);
assert(str(os) == itemFeed);
Modified: tuscany/sca-cpp/trunk/modules/atom/atom.hpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/atom/atom.hpp?rev=919720&r1=919719&r2=919720&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/atom/atom.hpp (original)
+++ tuscany/sca-cpp/trunk/modules/atom/atom.hpp Sat Mar 6 09:23:27 2010
@@ -38,7 +38,7 @@
/**
* Convert a list of elements to a list of values representing an ATOM entry.
*/
-const list<value> entryValues(const list<value>& e) {
+const list<value> entryElementsToValues(const list<value>& e) {
const list<value> lt = filter<value>(selector(mklist<value>(element, "title")), e);
const value t = isNil(lt)? value(emptyString) : elementValue(car(lt));
const list<value> li = filter<value>(selector(mklist<value>(element, "id")), e);
@@ -50,20 +50,20 @@
/**
* Convert a list of elements to a list of values representing ATOM entries.
*/
-const list<value> entriesValues(const list<value>& e) {
+const list<value> entriesElementsToValues(const list<value>& e) {
if (isNil(e))
return e;
- return cons<value>(entryValues(car(e)), entriesValues(cdr(e)));
+ return cons<value>(entryElementsToValues(car(e)), entriesElementsToValues(cdr(e)));
}
/**
* Convert a list of strings to a list of values representing an ATOM entry.
*/
-const failable<list<value> > readEntry(const list<string>& ilist) {
+const failable<list<value> > readATOMEntry(const list<string>& ilist) {
const list<value> e = readXML(ilist);
if (isNil(e))
return mkfailure<list<value> >("Empty entry");
- return entryValues(car(e));
+ return entryElementsToValues(car(e));
}
/**
@@ -77,7 +77,7 @@
/**
* Convert a list of strings to a list of values representing an ATOM feed.
*/
-const failable<list<value> > readFeed(const list<string>& ilist) {
+const failable<list<value> > readATOMFeed(const list<string>& ilist) {
const list<value> f = readXML(ilist);
if (isNil(f))
return mkfailure<list<value> >("Empty feed");
@@ -86,7 +86,7 @@
const list<value> e = filter<value>(selector(mklist<value>(element, "entry")), car(f));
if (isNil(e))
return mklist<value>(elementValue(car(t)), elementValue(car(i)));
- return cons<value>(elementValue(car(t)), cons(elementValue(car(i)), entriesValues(e)));
+ return cons<value>(elementValue(car(t)), cons(elementValue(car(i)), entriesElementsToValues(e)));
}
/**
Modified: tuscany/sca-cpp/trunk/modules/http/curl.hpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/http/curl.hpp?rev=919720&r1=919719&r2=919720&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/http/curl.hpp (original)
+++ tuscany/sca-cpp/trunk/modules/http/curl.hpp Sat Mar 6 09:23:27 2010
@@ -303,7 +303,7 @@
const string ct(content(contentType(car(content(res)))));
if (ct == "application/atom+xml;type=entry") {
- const value val(atom::entryValue(content(atom::readEntry(ls))));
+ const value val(atom::entryValue(content(atom::readATOMEntry(ls))));
debug(val, "http::get::result");
return val;
}
Modified: tuscany/sca-cpp/trunk/modules/java/client-test.cpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/java/client-test.cpp?rev=919720&r1=919719&r2=919720&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/java/client-test.cpp (original)
+++ tuscany/sca-cpp/trunk/modules/java/client-test.cpp Sat Mar 6 09:23:27 2010
@@ -27,16 +27,9 @@
#include "string.hpp"
#include "../server/client-test.hpp"
-namespace tuscany {
-namespace server {
-
-string testURI = "http://localhost:8090/java";
-
-}
-}
-
int main() {
tuscany::cout << "Testing..." << tuscany::endl;
+ tuscany::server::testURI = "http://localhost:8090/java";
tuscany::server::testServer();
Modified: tuscany/sca-cpp/trunk/modules/python/client-test.cpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/python/client-test.cpp?rev=919720&r1=919719&r2=919720&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/python/client-test.cpp (original)
+++ tuscany/sca-cpp/trunk/modules/python/client-test.cpp Sat Mar 6 09:23:27 2010
@@ -27,16 +27,9 @@
#include "string.hpp"
#include "../server/client-test.hpp"
-namespace tuscany {
-namespace server {
-
-string testURI = "http://localhost:8090/python";
-
-}
-}
-
int main() {
tuscany::cout << "Testing..." << tuscany::endl;
+ tuscany::server::testURI = "http://localhost:8090/python";
tuscany::server::testServer();
Modified: tuscany/sca-cpp/trunk/modules/server/client-test.cpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/server/client-test.cpp?rev=919720&r1=919719&r2=919720&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/server/client-test.cpp (original)
+++ tuscany/sca-cpp/trunk/modules/server/client-test.cpp Sat Mar 6 09:23:27 2010
@@ -27,16 +27,9 @@
#include "string.hpp"
#include "client-test.hpp"
-namespace tuscany {
-namespace server {
-
-string testURI = "http://localhost:8090/test";
-
-}
-}
-
int main() {
tuscany::cout << "Testing..." << tuscany::endl;
+ tuscany::server::testURI = "http://localhost:8090/test";
tuscany::server::testServer();
Modified: tuscany/sca-cpp/trunk/modules/server/client-test.hpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/server/client-test.hpp?rev=919720&r1=919719&r2=919720&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/server/client-test.hpp (original)
+++ tuscany/sca-cpp/trunk/modules/server/client-test.hpp Sat Mar 6 09:23:27 2010
@@ -36,7 +36,8 @@
namespace tuscany {
namespace server {
-extern string testURI;
+string testURI = "http://localhost:8090/test";
+bool testBlobs = true;
ostream* curlWriter(const string& s, ostream* os) {
(*os) << s;
@@ -50,7 +51,7 @@
ostringstream os;
const failable<list<ostream*> > r = http::get<ostream*>(curlWriter, &os, "http://localhost:8090", ch);
assert(hasContent(r));
- assert(contains(str(os), "HTTP/1.1 200 OK"));
+ assert(contains(str(os), "HTTP/1.1 200 OK") || contains(str(os), "HTTP/1.0 200 OK"));
assert(contains(str(os), "It works"));
}
{
@@ -121,8 +122,11 @@
http::CURLSession ch;
const lambda<bool()> el = evalLoop(testURI, ch);
cout << "JSON-RPC eval echo test " << time(el, 5, 200) << " ms" << endl;
- const lambda<bool()> bel = blobEvalLoop(testURI, ch);
- cout << "JSON-RPC eval blob test " << time(bel, 5, 200) << " ms" << endl;
+
+ if (testBlobs) {
+ const lambda<bool()> bel = blobEvalLoop(testURI, ch);
+ cout << "JSON-RPC eval blob test " << time(bel, 5, 200) << " ms" << endl;
+ }
return true;
}
@@ -176,7 +180,7 @@
const lambda<bool()> pl = postLoop(testURI, val, ch);
cout << "ATOMPub POST small test " << time(pl, 5, 200) << " ms" << endl;
}
- {
+ if (testBlobs) {
const list<value> i = list<value>()
+ (list<value>() + "name" + string("Apple"))
+ (list<value>() + "blob1" + blob)
Modified: tuscany/sca-cpp/trunk/modules/server/mod-eval.hpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/server/mod-eval.hpp?rev=919720&r1=919719&r2=919720&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/server/mod-eval.hpp (original)
+++ tuscany/sca-cpp/trunk/modules/server/mod-eval.hpp Sat Mar 6 09:23:27 2010
@@ -166,7 +166,7 @@
return rc;
const list<string> ls = httpd::read(r);
debug(ls, "modeval::post::input");
- const value entry = atom::entryValue(content(atom::readEntry(ls)));
+ const value entry = atom::entryValue(content(atom::readATOMEntry(ls)));
// Evaluate the POST expression
const failable<value> val = failableResult(impl(cons<value>("post", mklist<value>(cddr(path), entry))));
@@ -201,7 +201,7 @@
return rc;
const list<string> ls = httpd::read(r);
debug(ls, "modeval::put::input");
- const value entry = atom::entryValue(content(atom::readEntry(ls)));
+ const value entry = atom::entryValue(content(atom::readATOMEntry(ls)));
// Evaluate the PUT expression and update the corresponding resource
const failable<value> val = failableResult(impl(cons<value>("put", mklist<value>(cddr(path), entry))));
Modified: tuscany/sca-cpp/trunk/modules/wsgi/client-test.cpp
URL: http://svn.apache.org/viewvc/tuscany/sca-cpp/trunk/modules/wsgi/client-test.cpp?rev=919720&r1=919719&r2=919720&view=diff
==============================================================================
--- tuscany/sca-cpp/trunk/modules/wsgi/client-test.cpp (original)
+++ tuscany/sca-cpp/trunk/modules/wsgi/client-test.cpp Sat Mar 6 09:23:27 2010
@@ -27,16 +27,10 @@
#include "string.hpp"
#include "../server/client-test.hpp"
-namespace tuscany {
-namespace server {
-
-string testURI = "http://localhost:8090/wsgi";
-
-}
-}
-
int main() {
tuscany::cout << "Testing..." << tuscany::endl;
+ tuscany::server::testURI = "http://localhost:8090/wsgi";
+ tuscany::server::testBlobs = false;
tuscany::server::testServer();