You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jackrabbit.apache.org by re...@apache.org on 2023/12/20 12:43:55 UTC
(jackrabbit-filevault) branch bugfix/JCRVLT-738 created (now a15e2703)
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a change to branch bugfix/JCRVLT-738
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git
at a15e2703 JCRVLT-738: CugHandlingIT tests do not close resources
This branch includes the following new commits:
new a15e2703 JCRVLT-738: CugHandlingIT tests do not close resources
The 1 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
(jackrabbit-filevault) 01/01: JCRVLT-738: CugHandlingIT tests do not close resources
Posted by re...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
reschke pushed a commit to branch bugfix/JCRVLT-738
in repository https://gitbox.apache.org/repos/asf/jackrabbit-filevault.git
commit a15e2703de5e5d403724f04b2991b7cbcbc9004a
Author: Julian Reschke <re...@apache.org>
AuthorDate: Wed Dec 20 13:43:22 2023 +0100
JCRVLT-738: CugHandlingIT tests do not close resources
---
.../vault/packaging/integration/CugHandlingIT.java | 98 ++++++++++++----------
1 file changed, 52 insertions(+), 46 deletions(-)
diff --git a/vault-core-it/vault-core-integration-tests/src/main/java/org/apache/jackrabbit/vault/packaging/integration/CugHandlingIT.java b/vault-core-it/vault-core-integration-tests/src/main/java/org/apache/jackrabbit/vault/packaging/integration/CugHandlingIT.java
index 80cc9e1f..94419d37 100644
--- a/vault-core-it/vault-core-integration-tests/src/main/java/org/apache/jackrabbit/vault/packaging/integration/CugHandlingIT.java
+++ b/vault-core-it/vault-core-integration-tests/src/main/java/org/apache/jackrabbit/vault/packaging/integration/CugHandlingIT.java
@@ -41,6 +41,7 @@ import org.apache.jackrabbit.api.JackrabbitSession;
import org.apache.jackrabbit.api.security.user.UserManager;
import org.apache.jackrabbit.vault.fs.io.AccessControlHandling;
import org.apache.jackrabbit.vault.fs.io.ImportOptions;
+import org.apache.jackrabbit.vault.packaging.VaultPackage;
import org.junit.BeforeClass;
import org.junit.Test;
@@ -70,12 +71,13 @@ public final class CugHandlingIT extends IntegrationTestBase {
*/
@Test
public void testCugIgnore() throws Exception {
- extractVaultPackage(CUG_PACKAGE_1, IGNORE);
- Node testRoot = admin.getNode(TEST_ROOT);
- assertNodeExists(testRoot, "node_with_cug");
- Node nodeWithCug = testRoot.getNode("node_with_cug");
- assertProperty(nodeWithCug, "jcr:mixinTypes", asSet("rep:CugMixin"));
- assertNodeMissing(nodeWithCug, "rep:cugPolicy");
+ try (VaultPackage vp1 = extractVaultPackage(CUG_PACKAGE_1, IGNORE)) {
+ Node testRoot = admin.getNode(TEST_ROOT);
+ assertNodeExists(testRoot, "node_with_cug");
+ Node nodeWithCug = testRoot.getNode("node_with_cug");
+ assertProperty(nodeWithCug, "jcr:mixinTypes", asSet("rep:CugMixin"));
+ assertNodeMissing(nodeWithCug, "rep:cugPolicy");
+ }
}
/**
@@ -83,16 +85,17 @@ public final class CugHandlingIT extends IntegrationTestBase {
*/
@Test
public void testCugMerge() throws Exception {
- extractVaultPackage(CUG_PACKAGE_2, OVERWRITE);
- extractVaultPackage(CUG_PACKAGE_1, MERGE);
- Node testRoot = admin.getNode(TEST_ROOT);
- assertNodeExists(testRoot, "node_with_cug");
- Node nodeWithCug = testRoot.getNode("node_with_cug");
- assertProperty(nodeWithCug, "jcr:mixinTypes", asSet("rep:CugMixin"));
- assertNodeExists(nodeWithCug, "rep:cugPolicy");
- Node cugNode = nodeWithCug.getNode("rep:cugPolicy");
- assertProperty(cugNode, "jcr:primaryType", "rep:CugPolicy");
- assertProperty(cugNode,"rep:principalNames", asSet("principal-1", "principal-2", "principal-3"));
+ try (VaultPackage vp2 = extractVaultPackage(CUG_PACKAGE_2, OVERWRITE);
+ VaultPackage vp1 = extractVaultPackage(CUG_PACKAGE_1, MERGE)) {
+ Node testRoot = admin.getNode(TEST_ROOT);
+ assertNodeExists(testRoot, "node_with_cug");
+ Node nodeWithCug = testRoot.getNode("node_with_cug");
+ assertProperty(nodeWithCug, "jcr:mixinTypes", asSet("rep:CugMixin"));
+ assertNodeExists(nodeWithCug, "rep:cugPolicy");
+ Node cugNode = nodeWithCug.getNode("rep:cugPolicy");
+ assertProperty(cugNode, "jcr:primaryType", "rep:CugPolicy");
+ assertProperty(cugNode, "rep:principalNames", asSet("principal-1", "principal-2", "principal-3"));
+ }
}
/**
@@ -101,16 +104,17 @@ public final class CugHandlingIT extends IntegrationTestBase {
*/
@Test
public void testCugMergePreserve() throws Exception {
- extractVaultPackage(CUG_PACKAGE_2, OVERWRITE);
- extractVaultPackage(CUG_PACKAGE_1, AccessControlHandling.MERGE_PRESERVE);
- Node testRoot = admin.getNode(TEST_ROOT);
- assertNodeExists(testRoot, "node_with_cug");
- Node nodeWithCug = testRoot.getNode("node_with_cug");
- assertProperty(nodeWithCug, "jcr:mixinTypes", asSet("rep:CugMixin"));
- assertNodeExists(nodeWithCug, "rep:cugPolicy");
- Node cugNode = nodeWithCug.getNode("rep:cugPolicy");
- assertProperty(cugNode, "jcr:primaryType", "rep:CugPolicy");
- assertProperty(cugNode,"rep:principalNames", asSet("principal-1", "principal-2", "principal-3"));
+ try (VaultPackage vp2 = extractVaultPackage(CUG_PACKAGE_2, OVERWRITE);
+ VaultPackage vp1 = extractVaultPackage(CUG_PACKAGE_1, AccessControlHandling.MERGE_PRESERVE)) {
+ Node testRoot = admin.getNode(TEST_ROOT);
+ assertNodeExists(testRoot, "node_with_cug");
+ Node nodeWithCug = testRoot.getNode("node_with_cug");
+ assertProperty(nodeWithCug, "jcr:mixinTypes", asSet("rep:CugMixin"));
+ assertNodeExists(nodeWithCug, "rep:cugPolicy");
+ Node cugNode = nodeWithCug.getNode("rep:cugPolicy");
+ assertProperty(cugNode, "jcr:primaryType", "rep:CugPolicy");
+ assertProperty(cugNode, "rep:principalNames", asSet("principal-1", "principal-2", "principal-3"));
+ }
}
/**
@@ -118,16 +122,17 @@ public final class CugHandlingIT extends IntegrationTestBase {
*/
@Test
public void testCugOverwrite() throws Exception {
- extractVaultPackage(CUG_PACKAGE_1, OVERWRITE);
- extractVaultPackage(CUG_PACKAGE_2, OVERWRITE);
- Node testRoot = admin.getNode(TEST_ROOT);
- assertNodeExists(testRoot, "node_with_cug");
- Node nodeWithCug = testRoot.getNode("node_with_cug");
- assertProperty(nodeWithCug, "jcr:mixinTypes", asSet("rep:CugMixin"));
- assertNodeExists(nodeWithCug, "rep:cugPolicy");
- Node cugNode = nodeWithCug.getNode("rep:cugPolicy");
- assertProperty(cugNode, "jcr:primaryType", "rep:CugPolicy");
- assertProperty(cugNode,"rep:principalNames", asSet("principal-2", "principal-3"));
+ try (VaultPackage vp1 = extractVaultPackage(CUG_PACKAGE_1, OVERWRITE);
+ VaultPackage vp2 = extractVaultPackage(CUG_PACKAGE_2, OVERWRITE)) {
+ Node testRoot = admin.getNode(TEST_ROOT);
+ assertNodeExists(testRoot, "node_with_cug");
+ Node nodeWithCug = testRoot.getNode("node_with_cug");
+ assertProperty(nodeWithCug, "jcr:mixinTypes", asSet("rep:CugMixin"));
+ assertNodeExists(nodeWithCug, "rep:cugPolicy");
+ Node cugNode = nodeWithCug.getNode("rep:cugPolicy");
+ assertProperty(cugNode, "jcr:primaryType", "rep:CugPolicy");
+ assertProperty(cugNode, "rep:principalNames", asSet("principal-2", "principal-3"));
+ }
}
/**
@@ -135,18 +140,19 @@ public final class CugHandlingIT extends IntegrationTestBase {
*/
@Test
public void testCugSameAsAclByDefault() throws Exception {
- extractVaultPackage(CUG_PACKAGE_1, OVERWRITE);
ImportOptions opts = new ImportOptions();
opts.setAccessControlHandling(MERGE);
- extractVaultPackage(CUG_PACKAGE_2, opts);
- Node testRoot = admin.getNode(TEST_ROOT);
- assertNodeExists(testRoot, "node_with_cug");
- Node nodeWithCug = testRoot.getNode("node_with_cug");
- assertProperty(nodeWithCug, "jcr:mixinTypes", asSet("rep:CugMixin"));
- assertNodeExists(nodeWithCug, "rep:cugPolicy");
- Node cugNode = nodeWithCug.getNode("rep:cugPolicy");
- assertProperty(cugNode, "jcr:primaryType", "rep:CugPolicy");
- assertProperty(cugNode,"rep:principalNames", asSet("principal-1", "principal-2", "principal-3"));
+ try (VaultPackage vp1 = extractVaultPackage(CUG_PACKAGE_1, OVERWRITE);
+ VaultPackage vp2 = extractVaultPackage(CUG_PACKAGE_2, opts)) {
+ Node testRoot = admin.getNode(TEST_ROOT);
+ assertNodeExists(testRoot, "node_with_cug");
+ Node nodeWithCug = testRoot.getNode("node_with_cug");
+ assertProperty(nodeWithCug, "jcr:mixinTypes", asSet("rep:CugMixin"));
+ assertNodeExists(nodeWithCug, "rep:cugPolicy");
+ Node cugNode = nodeWithCug.getNode("rep:cugPolicy");
+ assertProperty(cugNode, "jcr:primaryType", "rep:CugPolicy");
+ assertProperty(cugNode, "rep:principalNames", asSet("principal-1", "principal-2", "principal-3"));
+ }
}
//*********************************************