svn commit: r947992 - /jackrabbit/trunk/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/simple/LitmusTest.java

[ju...@apache.org]

Author: jukka
Date: Tue May 25 10:06:26 2010
New Revision: 947992

URL: http://svn.apache.org/viewvc?rev=947992&view=rev
Log:
JCR-2614: Include the WebDAV litmus tests in the Jackrabbit integration tests

Use separate test cases for the different parts of the Litmus suite. This way we can explicitly track which parts are expected to pass and which fail.

Modified:
    jackrabbit/trunk/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/simple/LitmusTest.java

Modified: jackrabbit/trunk/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/simple/LitmusTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/simple/LitmusTest.java?rev=947992&r1=947991&r2=947992&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/simple/LitmusTest.java (original)
+++ jackrabbit/trunk/jackrabbit-jcr-server/src/test/java/org/apache/jackrabbit/webdav/simple/LitmusTest.java Tue May 25 10:06:26 2010
@@ -40,12 +40,35 @@ public class LitmusTest extends TestCase
      */
     private static final Logger log = LoggerFactory.getLogger(LitmusTest.class);
 
-    public void testLitmus() throws Exception {
+    private static String litmus = System.getProperty("litmus", "litmus");
+
+    private static boolean litmusIsAvailable = isLitmusAvailable(litmus);
+
+    public void testBasic() throws Exception {
+        assertLitmus("basic", 0);
+    }
+
+    public void testHttp() throws Exception {
+        assertLitmus("http", 0);
+    }
+
+    public void testProps() throws Exception {
+        assertLitmus("props", 0);
+    }
+
+    public void testCopyMove() throws Exception {
+        assertLitmus("copymove", 1); // FIXME: Currently expected to fail!
+    }
+
+    public void testLocks() throws Exception {
+        assertLitmus("locks", 1); // FIXME: Currently expected to fail!
+    }
+
+    private void assertLitmus(String tests, int exit) throws Exception {
         File dir = new File("target", "litmus");
-        String litmus = System.getProperty("litmus", "litmus");
 
         if (Boolean.getBoolean("jackrabbit.test.integration")
-                && litmusIsAvailable(litmus)) {
+                && litmusIsAvailable) {
             final Repository repository = JcrUtils.getRepository(
                     "jcr-jackrabbit://" + dir.getCanonicalPath());
             Session session = repository.login(); // for the TransientRepository
@@ -78,14 +101,13 @@ public class LitmusTest extends TestCase
 
                     ProcessBuilder builder =
                         new ProcessBuilder(litmus, url, "admin", "admin");
-                    builder.environment().put(
-                            "TESTS", "basic http props"); // copymove locks
+                    builder.environment().put("TESTS", tests);
                     builder.directory(dir);
                     builder.redirectErrorStream();
 
                     Process process = builder.start();
                     IOUtils.copy(process.getInputStream(), System.out);
-                    assertEquals(0, process.waitFor());
+                    assertEquals(exit, process.waitFor());
                 } finally {
                     server.stop();
                 }
@@ -95,7 +117,7 @@ public class LitmusTest extends TestCase
         }
     }
 
-    private boolean litmusIsAvailable(String litmus) {
+    private static boolean isLitmusAvailable(String litmus) {
         try {
             ProcessBuilder builder = new ProcessBuilder(litmus, "--version");
             builder.redirectErrorStream();