adds jersey-json dependency with version management in the parent pom

adds integration test for JSON at the describe endpoint
fcrepo · Apr 25, 2013 · ad75ee4 · ad75ee4
1 parent 06d4946
commit ad75ee4
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/fcrepo-http-api/pom.xml b/fcrepo-http-api/pom.xml
@@ -42,7 +42,11 @@
     <dependency>
     	<groupId>com.sun.jersey</groupId>
     	<artifactId>jersey-core</artifactId>
-    	</dependency>
+    </dependency>
+    <dependency>
+    	<groupId>com.sun.jersey</groupId>
+    	<artifactId>jersey-json</artifactId>
+    </dependency>
     <dependency>
       <groupId>com.yammer.metrics</groupId>
       <artifactId>metrics-jersey</artifactId>

diff --git a/fcrepo-http-api/src/test/java/org/fcrepo/integration/api/FedoraRepositoryIT.java b/fcrepo-http-api/src/test/java/org/fcrepo/integration/api/FedoraRepositoryIT.java
@@ -3,6 +3,7 @@
 
 import static java.util.regex.Pattern.DOTALL;
 import static java.util.regex.Pattern.compile;
+import static javax.ws.rs.core.MediaType.APPLICATION_JSON;
 import static javax.ws.rs.core.MediaType.TEXT_XML;
 import static org.junit.Assert.assertEquals;
 import static org.junit.Assert.assertTrue;
@@ -40,6 +41,19 @@ public void testDescribe() throws Exception {
                 description).find());
     }
 
+    @Test
+    public void testDescribeJSON() throws Exception {
+        final HttpGet method = new HttpGet(serverAddress + "describe");
+        method.addHeader("Accept", APPLICATION_JSON);
+        final HttpResponse response = client.execute(method);
+        assertEquals(200, response.getStatusLine().getStatusCode());
+        final String description = EntityUtils.toString(response.getEntity());
+        logger.debug("HERE WE ARE: Found the repository description:\n" + description);
+        assertTrue("Failed to find a proper repo version", compile(
+                "\"repositoryVersion\"\\s*:\\s*\".*\"").matcher(
+                description).find());
+    }
+
     @Test
     public void testDescribeHtml() throws Exception {
         final HttpGet method = new HttpGet(serverAddress + "describe");

diff --git a/pom.xml b/pom.xml
@@ -206,6 +206,11 @@
         <artifactId>jersey-spring</artifactId>
         <version>${jersey.version}</version>
       </dependency>
+      <dependency>
+        <groupId>com.sun.jersey</groupId>
+        <artifactId>jersey-json</artifactId>
+        <version>${jersey.version}</version>
+      </dependency>
 
       <!-- sesame/openrdf dependencies that were previously provided by the Aduna 
         Maven repo -->