You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@sling.apache.org by an...@apache.org on 2021/06/10 14:06:59 UTC
[sling-org-apache-sling-feature-cpconverter] branch master updated:
revert c57bc6dd2ea9f05fc3bff8da3ff2f2d4fd840ed8. should have been pushed to
a branch instead
This is an automated email from the ASF dual-hosted git repository.
angela pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/sling-org-apache-sling-feature-cpconverter.git
The following commit(s) were added to refs/heads/master by this push:
new e1ef260 revert c57bc6dd2ea9f05fc3bff8da3ff2f2d4fd840ed8. should have been pushed to a branch instead
e1ef260 is described below
commit e1ef2603085f08a777f89e6944bfc08b4585866d
Author: angela <an...@adobe.com>
AuthorDate: Thu Jun 10 16:06:47 2021 +0200
revert c57bc6dd2ea9f05fc3bff8da3ff2f2d4fd840ed8. should have been pushed to a branch instead
---
.../ConverterUserAndPermissionTest.java | 45 ----------------------
1 file changed, 45 deletions(-)
diff --git a/src/test/java/org/apache/sling/feature/cpconverter/ConverterUserAndPermissionTest.java b/src/test/java/org/apache/sling/feature/cpconverter/ConverterUserAndPermissionTest.java
index e3af95f..8355e13 100644
--- a/src/test/java/org/apache/sling/feature/cpconverter/ConverterUserAndPermissionTest.java
+++ b/src/test/java/org/apache/sling/feature/cpconverter/ConverterUserAndPermissionTest.java
@@ -39,16 +39,12 @@ import java.io.IOException;
import java.io.InputStream;
import java.net.URL;
import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
import java.util.Arrays;
import java.util.Collection;
import java.util.Collections;
import java.util.HashSet;
-import java.util.LinkedHashSet;
-import java.util.List;
import java.util.Set;
import java.util.zip.ZipEntry;
-import java.util.zip.ZipException;
import java.util.zip.ZipFile;
import static org.junit.Assert.assertFalse;
@@ -134,7 +130,6 @@ public class ConverterUserAndPermissionTest extends AbstractConverterTest {
verifyContentPackage(converted, notExpected, expected);
assertExpectedPolicies(converted);
- assertFilterXml(converted);
} finally {
deleteDirTree(outputDirectory);
}
@@ -169,7 +164,6 @@ public class ConverterUserAndPermissionTest extends AbstractConverterTest {
verifyContentPackage(converted, notExpected, expected);
assertExpectedPolicies(converted);
- assertFilterXml(converted);
} finally {
deleteDirTree(outputDirectory);
}
@@ -198,7 +192,6 @@ public class ConverterUserAndPermissionTest extends AbstractConverterTest {
File converted = new File(unrefOutputDir, "my_packages/demo-cp/0.0.0/demo-cp-0.0.0-cp2fm-converted.zip");
verifyContentPackage(converted, COMMON_NOT_EXPECTED_PATHS, COMMON_EXPECTED_PATHS);
assertExpectedPolicies(converted);
- assertFilterXml(converted);
} finally {
deleteDirTree(outputDirectory);
}
@@ -227,42 +220,4 @@ public class ConverterUserAndPermissionTest extends AbstractConverterTest {
}
}
}
-
- private static void assertFilterXml(@NotNull File contentPackage) throws IOException {
- try (ZipFile zipFile = new ZipFile(contentPackage)) {
- ZipEntry entry = zipFile.getEntry("META-INF/vault/filter.xml");
- assertNotNull(entry);
- assertFalse(entry.isDirectory());
-
- try (InputStream in = zipFile.getInputStream(entry)) {
- String filterXml = IOUtils.toString(in, StandardCharsets.UTF_8);
-
- List<String> expected = new ArrayList<>();
- expected.add("/home/users/demo-cp");
- expected.add("/home/groups/demo-cp");
- expected.add("/demo-cp");
-
- for (String expectedPath : expected) {
- String p = getFilterPath(expectedPath);
- assertTrue(p, filterXml.contains(p));
- }
-
- List<String> notExpected = new ArrayList<>();
- notExpected.add("/apps/demo-cp");
- notExpected.add("/home/users/system/demo-cp");
- notExpected.add("/home/users/system/cq:services/demo-cp");
-
- for (String unexpectedPath : notExpected) {
- String p = getFilterPath(unexpectedPath);
- assertFalse(p, filterXml.contains(p));
- }
- }
- }
- }
-
- @NotNull
- private static String getFilterPath(@NotNull String path) {
- String p = (path.startsWith("jcr_root")) ? path.substring("jcr_root".length()) : path;
- return "<filter root=\""+p+"\"/>";
- }
}