svn commit: r1827489 - /jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestACEsAtRoot.java

[tr...@apache.org]

Author: tripod
Date: Thu Mar 22 13:34:07 2018
New Revision: 1827489

URL: http://svn.apache.org/viewvc?rev=1827489&view=rev
Log:
JCRVLT-278 Root path ACEs removed due to JCRVLT-227

Modified:
    jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestACEsAtRoot.java

Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestACEsAtRoot.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestACEsAtRoot.java?rev=1827489&r1=1827488&r2=1827489&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestACEsAtRoot.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestACEsAtRoot.java Thu Mar 22 13:34:07 2018
@@ -48,6 +48,7 @@ import org.apache.jackrabbit.vault.packa
 import org.apache.jackrabbit.vault.packaging.PackageException;
 import org.apache.jackrabbit.vault.packaging.PackageProperties;
 import org.apache.jackrabbit.vault.packaging.VaultPackage;
+import org.junit.Ignore;
 import org.junit.Test;
 
 import static org.junit.Assert.assertEquals;
@@ -57,6 +58,7 @@ public class TestACEsAtRoot extends Inte
     @Test
     public void export() throws RepositoryException, IOException, PackageException, ConfigurationException {
 
+        // todo: check why this is not working as expected
 
         UserManager userManager = ((JackrabbitSession)admin).getUserManager();
 
@@ -72,6 +74,8 @@ public class TestACEsAtRoot extends Inte
         String profilePath = admin.getNode(userPath).addNode("profile").getPath();
         admin.save();
 
+        assertNodeExists(userPath);
+
         // Setup ACEs at the root path, for the user
 
         AccessControlUtils.addAccessControlEntry(admin, null, principal1, new String[]{"jcr:namespaceManagement"}, true);
@@ -92,15 +96,17 @@ public class TestACEsAtRoot extends Inte
 //        filter.addPropertyFilterSet(pfilterSet);
 
         PathFilterSet userFilterSet = new PathFilterSet(userPath);
-        userFilterSet.addInclude(new DefaultPathFilter(userPath));
+//        userFilterSet.addInclude(new DefaultPathFilter(userPath));
+//        userFilterSet.addInclude(new DefaultPathFilter(profilePath + "(/.*)?"));
+//        userFilterSet.addInclude(new DefaultPathFilter(repPolicyPath + "(/.*)?"));
         filter.add(userFilterSet);
 
-        PathFilterSet profileSet = new PathFilterSet(profilePath);
-        profileSet.addInclude(new DefaultPathFilter(profilePath));
-        filter.add(profileSet);
-
-        PathFilterSet repPolicySet = new PathFilterSet(repPolicyPath);
-        filter.add(repPolicySet);
+//        PathFilterSet profileSet = new PathFilterSet(profilePath);
+//        profileSet.addInclude(new DefaultPathFilter(profilePath));
+//        filter.add(profileSet);
+//
+//        PathFilterSet repPolicySet = new PathFilterSet(repPolicyPath);
+//        filter.add(repPolicySet);
 
         inf.setFilter(filter);
         Properties props = new Properties();
@@ -115,10 +121,10 @@ public class TestACEsAtRoot extends Inte
         opts.setRootPath("/");
         opts.setCompressionLevel(Deflater.BEST_SPEED);
 
-        File tmpFile = File.createTempFile("vaulttest", "zip");
+        File tmpFile = File.createTempFile("vaulttest", ".zip");
         OutputStream os = new FileOutputStream(tmpFile);
         Session session = repository.login(new SimpleCredentials(userId, userPwd.toCharArray()));
-        packMgr.assemble(session, opts, os);
+        packMgr.assemble(admin, opts, os);
         os.close();
         session.logout();
 
@@ -127,7 +133,7 @@ public class TestACEsAtRoot extends Inte
         clean(userPath);
 
         ImportOptions importOptions = new ImportOptions();
-        importOptions.setImportMode(ImportMode.UPDATE);
+//        importOptions.setImportMode(ImportMode.UPDATE);
         importOptions.setAccessControlHandling(AccessControlHandling.OVERWRITE);
         importOptions.setPatchKeepInRepo(false);