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 2019/09/24 11:51:27 UTC
svn commit: r1867446 -
/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestUserContentPackage.java
Author: reschke
Date: Tue Sep 24 11:51:27 2019
New Revision: 1867446
URL: http://svn.apache.org/viewvc?rev=1867446&view=rev
Log:
JCRVLT-376: test cases leak 'vaulttest*zip' temp files (continued)
Modified:
jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestUserContentPackage.java
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestUserContentPackage.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestUserContentPackage.java?rev=1867446&r1=1867445&r2=1867446&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestUserContentPackage.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestUserContentPackage.java Tue Sep 24 11:51:27 2019
@@ -271,22 +271,21 @@ public class TestUserContentPackage exte
File tmpFile = createPackage("test", "test", u.getPath());
try {
u.remove();
- u = (User) mgr.getAuthorizable(ID_TEST_USER_A);
+ u = (User) mgr.getAuthorizable(ID_TEST_USER_A);
assertNull(u);
-
- JcrPackage pack = packMgr.upload(tmpFile, true, true, null);
- assertNotNull(pack);
- ImportOptions opts = getDefaultOptions();
- pack.install(opts);
-
-
- u = (User) mgr.getAuthorizable(ID_TEST_USER_A);
- assertNotNull(u);
-
- node = admin.getNode(u.getPath());
- property = node.getProperty("mv");
- assertTrue(property.isMultiple());
+ try (JcrPackage pack = packMgr.upload(tmpFile, true, true, null)) {
+ assertNotNull(pack);
+ ImportOptions opts = getDefaultOptions();
+ pack.install(opts);
+
+ u = (User) mgr.getAuthorizable(ID_TEST_USER_A);
+ assertNotNull(u);
+
+ node = admin.getNode(u.getPath());
+ property = node.getProperty("mv");
+ assertTrue(property.isMultiple());
+ }
} finally {
tmpFile.delete();
}
@@ -309,17 +308,18 @@ public class TestUserContentPackage exte
u = (User) mgr.getAuthorizable(ID_TEST_USER_A);
assertNull(u);
- JcrPackage pack = packMgr.upload(tmpFile, true, true, null);
- assertNotNull(pack);
- ImportOptions opts = getDefaultOptions();
- pack.install(opts);
-
- u = (User) mgr.getAuthorizable(ID_TEST_USER_A);
- assertNotNull(u);
-
- node = admin.getNode(u.getPath());
- property = node.getProperty("mv");
- assertTrue(property.isMultiple());
+ try (JcrPackage pack = packMgr.upload(tmpFile, true, true, null);) {
+ assertNotNull(pack);
+ ImportOptions opts = getDefaultOptions();
+ pack.install(opts);
+
+ u = (User) mgr.getAuthorizable(ID_TEST_USER_A);
+ assertNotNull(u);
+
+ node = admin.getNode(u.getPath());
+ property = node.getProperty("mv");
+ assertTrue(property.isMultiple());
+ }
} finally {
tmpFile.delete();
}
@@ -494,9 +494,7 @@ public class TestUserContentPackage exte
return userA;
}
-
-
- public File createPackage(String group, String name, String... paths) throws RepositoryException, IOException, PackageException {
+ private File createPackage(String group, String name, String... paths) throws RepositoryException, IOException, PackageException {
ExportOptions opts = new ExportOptions();
DefaultMetaInf inf = new DefaultMetaInf();
DefaultWorkspaceFilter filter = new DefaultWorkspaceFilter();