Minor code cleanup, refactored some ATOM data conversion functions, simplified client test cases.

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

1 files changed, 4 insertions, 4 deletions

diff --git a/sca-cpp/trunk/modules/atom/atom-test.cpp b/sca-cpp/trunk/modules/atom/atom-test.cpp
index 560c383a23..316e8b44db 100644
--- a/sca-cpp/trunk/modules/atom/atom-test.cpp
+++ b/sca-cpp/trunk/modules/atom/atom-test.cpp
@@ -80,13 +80,13 @@ bool testEntry() {
         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 @@ bool testFeed() {
         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 @@ bool testFeed() {
         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);