jackrabbit-oak-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ang...@apache.org
Subject svn commit: r1482634 - in /jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user: UserImportBestEffortTest.java UserImportTest.java UserImportWithActionsTest.java
Date Tue, 14 May 2013 22:49:20 GMT
Author: angela
Date: Tue May 14 22:49:19 2013
New Revision: 1482634

URL: http://svn.apache.org/r1482634
Log:
OAK-414: adjust @Ignore annotation, clear TODOs

Modified:
    jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportBestEffortTest.java
    jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportTest.java
    jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportWithActionsTest.java

Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportBestEffortTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportBestEffortTest.java?rev=1482634&r1=1482633&r2=1482634&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportBestEffortTest.java
(original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportBestEffortTest.java
Tue May 14 22:49:19 2013
@@ -35,7 +35,6 @@ import org.apache.jackrabbit.api.securit
 import org.apache.jackrabbit.oak.spi.security.user.UserConstants;
 import org.apache.jackrabbit.oak.spi.xml.ImportBehavior;
 import org.apache.jackrabbit.test.NotExecutableException;
-import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -139,7 +138,6 @@ public class UserImportBestEffortTest ex
         }
     }
 
-    @Ignore("OAK-615") // FIXME
     @Test
     public void testImportCircularMembership() throws Exception {
 

Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportTest.java?rev=1482634&r1=1482633&r2=1482634&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportTest.java
(original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportTest.java
Tue May 14 22:49:19 2013
@@ -39,6 +39,7 @@ import org.apache.jackrabbit.api.securit
 import org.apache.jackrabbit.api.security.user.User;
 import org.apache.jackrabbit.oak.spi.security.user.UserConstants;
 import org.apache.jackrabbit.test.NotExecutableException;
+import org.junit.Ignore;
 import org.junit.Test;
 
 /**
@@ -145,6 +146,7 @@ public class UserImportTest extends Abst
      * @since OAK 1.0 : constraintviolation is no longer detected during import
      * but only upon save.
      */
+    @Ignore("OAK-821")
     @Test
     public void testImportGroupIntoUsersTree() throws Exception {
         String xml = "<?xml version=\"1.0\" encoding=\"UTF-8\"?>\n" +
@@ -747,7 +749,6 @@ public class UserImportTest extends Abst
         try {
             doImport(USERPATH, xml);
 
-            //TODO different IgnoreBehavior needed?
             // re-import should succeed if UUID-behavior is set accordingly
             doImport(USERPATH, xml, ImportUUIDBehavior.IMPORT_UUID_COLLISION_REMOVE_EXISTING);
 
@@ -785,7 +786,6 @@ public class UserImportTest extends Abst
             doImport(USERPATH, xml);
             adminSession.save();
 
-            //TODO different IgnoreBehavior needed?
             // re-import should succeed if UUID-behavior is set accordingly
             doImport(USERPATH, xml, ImportUUIDBehavior.IMPORT_UUID_COLLISION_REMOVE_EXISTING);
 

Modified: jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportWithActionsTest.java
URL: http://svn.apache.org/viewvc/jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportWithActionsTest.java?rev=1482634&r1=1482633&r2=1482634&view=diff
==============================================================================
--- jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportWithActionsTest.java
(original)
+++ jackrabbit/oak/trunk/oak-jcr/src/test/java/org/apache/jackrabbit/oak/jcr/security/user/UserImportWithActionsTest.java
Tue May 14 22:49:19 2013
@@ -65,14 +65,6 @@ public class UserImportWithActionsTest e
         jrSession = (JackrabbitSession) superuser;
     }
 
-    @Override
-    protected void tearDown() throws Exception {
-        //TODO
-        try {
-            super.tearDown();
-        } catch (Exception ignore) {}
-    }
-
     private void setAuthorizableActions(AuthorizableAction action) {
         // TODO clarify how to test AuthorizableActions in Oak
         // userMgr.setAuthorizableActions(new AuthorizableAction[] {testAction});



Mime
View raw message