Removed dependency on HTTP APIs for testing per: https://www.pivotalt…

…racker.com/story/show/47962441
fcrepo · Apr 12, 2013 · 53c586f · 53c586f
1 parent 4791b75
commit 53c586f
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 10 deletions.
diff --git a/fcrepo-rss/pom.xml b/fcrepo-rss/pom.xml
@@ -24,12 +24,6 @@
     </dependency>
 
     <!-- test gear -->
-    <dependency>
-      <groupId>org.fcrepo</groupId>
-      <artifactId>fcrepo-legacy-api</artifactId>
-      <version>${project.version}</version>
-      <scope>test</scope>
-    </dependency>
     <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>

diff --git a/fcrepo-rss/src/test/java/org/fcrepo/integration/syndication/RSSIT.java b/fcrepo-rss/src/test/java/org/fcrepo/integration/syndication/RSSIT.java
@@ -3,14 +3,24 @@
 
 import static java.util.regex.Pattern.DOTALL;
 import static java.util.regex.Pattern.compile;
+import static org.fcrepo.services.PathService.OBJECT_PATH;
+import static org.fcrepo.utils.FedoraJcrTypes.FEDORA_OBJECT;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
 
+import javax.inject.Inject;
+import javax.jcr.Node;
+import javax.jcr.Repository;
+import javax.jcr.Session;
+
 import org.apache.http.HttpResponse;
 import org.apache.http.client.methods.HttpGet;
 import org.apache.http.client.methods.HttpPost;
 import org.apache.http.util.EntityUtils;
+import org.fcrepo.services.PathService;
+import org.fcrepo.utils.FedoraJcrTypes;
 import org.junit.Test;
+import org.modeshape.jcr.api.JcrTools;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.test.context.ContextConfiguration;
@@ -20,12 +30,21 @@
 public class RSSIT extends AbstractResourceIT {
 
     final private Logger logger = LoggerFactory.getLogger(RSSIT.class);
-
+
+    @Inject
+    Repository repo;
+
+    JcrTools jcrTools = new JcrTools(true);
+
     @Test
     public void testRSS() throws Exception {
 
-        assertEquals(201, getStatus(new HttpPost(serverAddress +
-                "/objects/RSSTESTPID")));
+        final Session session = repo.login();
+        final Node object =
+                jcrTools.findOrCreateChild(session.getNode(OBJECT_PATH), "RSSTESTPID");
+        object.addMixin(FEDORA_OBJECT);
+        session.save();
+        session.logout();
 
         HttpGet getRSSMethod = new HttpGet(serverAddress + "/rss");
         HttpResponse response = client.execute(getRSSMethod);

diff --git a/fcrepo-rss/src/test/resources/spring-test/rest.xml b/fcrepo-rss/src/test/resources/spring-test/rest.xml
@@ -23,7 +23,6 @@
 
     <jaxrs:server address="http://localhost:${test.port:8080}">
         <jaxrs:serviceBeans>
-            <bean class="org.fcrepo.api.legacy.FedoraObjects"/>
             <bean class="org.fcrepo.syndication.RSSPublisher"/>
         </jaxrs:serviceBeans>
     </jaxrs:server>