jackrabbit-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ang...@apache.org
Subject svn commit: r753226 - in /jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/retention: AbstractRetentionTest.java HoldTest.java RetentionPolicyTest.java
Date Fri, 13 Mar 2009 13:03:29 GMT
Author: angela
Date: Fri Mar 13 13:03:29 2009
New Revision: 753226

URL: http://svn.apache.org/viewvc?rev=753226&view=rev
Log:
use checkSupportedOption method from AbstractJcrTest

Modified:
    jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/retention/AbstractRetentionTest.java
    jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/retention/HoldTest.java
    jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/retention/RetentionPolicyTest.java

Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/retention/AbstractRetentionTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/retention/AbstractRetentionTest.java?rev=753226&r1=753225&r2=753226&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/retention/AbstractRetentionTest.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/retention/AbstractRetentionTest.java
Fri Mar 13 13:03:29 2009
@@ -20,7 +20,6 @@
 import org.apache.jackrabbit.test.NotExecutableException;
 import org.apache.jackrabbit.test.RepositoryStub;
 import org.apache.jackrabbit.core.retention.RetentionPolicyImpl;
-import org.apache.jackrabbit.core.SessionImpl;
 
 import javax.jcr.RepositoryException;
 import javax.jcr.Session;
@@ -69,12 +68,6 @@
         }
     }
 
-    protected static void checkSupportedOption(Session s, String option) throws NotExecutableException
{
-        if (Boolean.FALSE.toString().equals(s.getRepository().getDescriptor(option))) {
-            throw new NotExecutableException();
-        }
-    }
-
     protected static org.apache.jackrabbit.api.jsr283.Session getJsr283Session(Session s)
throws NotExecutableException {
         // TODO: get rid of method once jsr 283 is released
         if (s instanceof org.apache.jackrabbit.api.jsr283.Session) {

Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/retention/HoldTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/retention/HoldTest.java?rev=753226&r1=753225&r2=753226&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/retention/HoldTest.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/retention/HoldTest.java
Fri Mar 13 13:03:29 2009
@@ -307,7 +307,7 @@
     }
 
     private Node getLockedChildNode() throws NotExecutableException, RepositoryException
{
-        checkSupportedOption(superuser, Repository.OPTION_LOCKING_SUPPORTED);
+        checkSupportedOption(Repository.OPTION_LOCKING_SUPPORTED);
         Node child = testRootNode.addNode(nodeName2, testNodeType);
         if (!child.isNodeType(mixLockable)) {
             if (child.canAddMixin(mixLockable)) {
@@ -386,7 +386,7 @@
     }
 
     private Node getVersionableChildNode() throws NotExecutableException, RepositoryException
{
-        checkSupportedOption(superuser, Repository.OPTION_VERSIONING_SUPPORTED);
+        checkSupportedOption(Repository.OPTION_VERSIONING_SUPPORTED);
         Node child = testRootNode.addNode(nodeName2, testNodeType);
         if (!child.isNodeType(mixVersionable)) {
             if (child.canAddMixin(mixVersionable)) {

Modified: jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/retention/RetentionPolicyTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/retention/RetentionPolicyTest.java?rev=753226&r1=753225&r2=753226&view=diff
==============================================================================
--- jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/retention/RetentionPolicyTest.java
(original)
+++ jackrabbit/trunk/jackrabbit-core/src/test/java/org/apache/jackrabbit/api/jsr283/retention/RetentionPolicyTest.java
Fri Mar 13 13:03:29 2009
@@ -301,7 +301,7 @@
     }
 
     private Node getLockedChildNode() throws NotExecutableException, RepositoryException
{
-        checkSupportedOption(superuser, Repository.OPTION_LOCKING_SUPPORTED);
+        checkSupportedOption(Repository.OPTION_LOCKING_SUPPORTED);
         Node child = testRootNode.addNode(nodeName2, testNodeType);
         if (!child.isNodeType(mixLockable)) {
             if (child.canAddMixin(mixLockable)) {
@@ -374,7 +374,7 @@
     }
 
     private Node getVersionableChildNode() throws NotExecutableException, RepositoryException
{
-        checkSupportedOption(superuser, Repository.OPTION_VERSIONING_SUPPORTED);
+        checkSupportedOption(Repository.OPTION_VERSIONING_SUPPORTED);
         Node child = testRootNode.addNode(nodeName2, testNodeType);
         if (!child.isNodeType(mixVersionable)) {
             if (child.canAddMixin(mixVersionable)) {



Mime
View raw message