TUSCANY-3288 - Fixing up test scenario and re-enabling test case

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

3 files changed, 2 insertions, 53 deletions

diff --git a/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsService.java b/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsService.java
index d5bc760f3f..c4fafc30bb 100644
--- a/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsService.java
+++ b/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsService.java
@@ -27,55 +27,6 @@ import org.apache.tuscany.sca.data.collection.NotFoundException;
 import org.osoa.sca.annotations.Remotable;
 
 @Remotable
-//@XmlSeeAlso(Headline.class)
-public interface NewsService /*extends Collection<String, Headline>*/{
+public interface NewsService extends Collection<String, Headline>{
 
-    /**
-     * Get the whole collection.
-     * 
-     * @return the whole collection.
-     */
-    Entry<String, Headline>[] getAll();
-
-    /**
-     * Returns a collection resulting from a query.
-     * 
-     * @return the collection.
-     */
-    Entry<String, Headline>[] query(String queryString);
-
-    /**
-     * Creates a new item.
-     * 
-     * @param key
-     * @param item
-     * @return
-     */
-    String post(String key, Headline item);
-
-    /**
-     * Retrieves an item.
-     * 
-     * @param key
-     * @return
-     */
-    Headline get(String key) throws NotFoundException;
-
-    /**
-     * Updates an item.
-     * 
-     * @param key
-     * @param item
-     * @return
-     */
-    void put(String key, Headline item) throws NotFoundException;
-
-    /**
-     * Delete an item.
-     * 
-     * @param key
-     */
-    void delete(String key) throws NotFoundException;
-
-    
 }
diff --git a/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsServiceImpl.java b/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsServiceImpl.java
index b274cc1487..b51845ba1c 100644
--- a/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsServiceImpl.java
+++ b/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsServiceImpl.java
@@ -22,8 +22,6 @@ package org.apache.tuscany.sca.binding.atom.news;
 import java.util.HashMap;
 import java.util.Map;
 
-import javax.xml.bind.annotation.XmlSeeAlso;
-
 import org.apache.tuscany.sca.data.collection.Entry;
 import org.apache.tuscany.sca.data.collection.NotFoundException;
 import org.osoa.sca.annotations.Init;
diff --git a/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsServiceTestCase.java b/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsServiceTestCase.java
index e519837061..454947ed98 100644
--- a/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsServiceTestCase.java
+++ b/branches/sca-java-1.x/modules/binding-atom-abdera/src/test/java/org/apache/tuscany/sca/binding/atom/news/NewsServiceTestCase.java
@@ -55,7 +55,7 @@ public class NewsServiceTestCase {
     }
     
     @Test
-    @Ignore("TUSCANY-3288")
+    //@Ignore("TUSCANY-3288")
     public void testNewsService() throws Exception {
         Entry<String, Headline>[] entries = newsService.getAll();