jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From resc...@apache.org
Subject svn commit: r1338177 - in /jackrabbit/branches/2.4: ./ jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/AbstractMergeTest.java jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/MergeActivityTest.java
Date Mon, 14 May 2012 12:21:08 GMT
Author: reschke
Date: Mon May 14 12:21:08 2012
New Revision: 1338177

URL: http://svn.apache.org/viewvc?rev=1338177&view=rev
Log:
JCR-3307: check supported option OPTION_ACTIVITIES_SUPPORTED (ported to 2.4)

Modified:
    jackrabbit/branches/2.4/   (props changed)
    jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/AbstractMergeTest.java
    jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/MergeActivityTest.java

Propchange: jackrabbit/branches/2.4/
------------------------------------------------------------------------------
  Merged /jackrabbit/trunk:r1338172

Modified: jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/AbstractMergeTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/AbstractMergeTest.java?rev=1338177&r1=1338176&r2=1338177&view=diff
==============================================================================
--- jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/AbstractMergeTest.java
(original)
+++ jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/AbstractMergeTest.java
Mon May 14 12:21:08 2012
@@ -24,6 +24,7 @@ import javax.jcr.nodetype.NodeType;
 import javax.jcr.nodetype.NodeTypeManager;
 
 import org.apache.jackrabbit.test.AbstractJCRTest;
+import org.apache.jackrabbit.test.NotExecutableException;
 
 /**
  * <code>AbstractMergeTest</code> is the abstract base class for all merge
@@ -133,5 +134,5 @@ public abstract class AbstractMergeTest 
     }
 
     // initialize nodes
-    abstract void initNodes() throws RepositoryException;
+    abstract void initNodes() throws RepositoryException, NotExecutableException;
 }
\ No newline at end of file

Modified: jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/MergeActivityTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/MergeActivityTest.java?rev=1338177&r1=1338176&r2=1338177&view=diff
==============================================================================
--- jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/MergeActivityTest.java
(original)
+++ jackrabbit/branches/2.4/jackrabbit-jcr-tests/src/main/java/org/apache/jackrabbit/test/api/version/MergeActivityTest.java
Mon May 14 12:21:08 2012
@@ -18,9 +18,11 @@ package org.apache.jackrabbit.test.api.v
 
 import javax.jcr.Node;
 import javax.jcr.NodeIterator;
+import javax.jcr.Repository;
 import javax.jcr.RepositoryException;
 import javax.jcr.version.VersionManager;
 
+import org.apache.jackrabbit.test.NotExecutableException;
 /**
  * <code>MergeActivityTest</code> contains tests dealing with merging activities
  *
@@ -75,7 +77,9 @@ public class MergeActivityTest extends A
     /**
      * initialize a versionable node on default and second workspace
      */
-    protected void initNodes() throws RepositoryException {
+    protected void initNodes() throws RepositoryException, NotExecutableException {
+
+        checkSupportedOption(Repository.OPTION_ACTIVITIES_SUPPORTED);
 
         VersionManager versionManager = testRootNode.getSession().getWorkspace().getVersionManager();
 



Mime
View raw message