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 08:51:32 UTC
svn commit: r1867436 - in
/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration:
TestEscapedExport.java TestUserContentPackage.java
Author: reschke
Date: Tue Sep 24 08:51:32 2019
New Revision: 1867436
URL: http://svn.apache.org/viewvc?rev=1867436&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/TestEscapedExport.java
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/TestEscapedExport.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestEscapedExport.java?rev=1867436&r1=1867435&r2=1867436&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestEscapedExport.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestEscapedExport.java Tue Sep 24 08:51:32 2019
@@ -131,7 +131,9 @@ public class TestEscapedExport extends I
packMgr.assemble(admin, options, pkgFile).close();
clean("/tmp");
- packMgr.open(pkgFile).extract(admin, getDefaultOptions());
+ try (VaultPackage vp = packMgr.open(pkgFile)) {
+ vp.extract(admin, getDefaultOptions());
+ }
} finally {
pkgFile.delete();
}
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=1867436&r1=1867435&r2=1867436&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 08:51:32 2019
@@ -269,24 +269,27 @@ public class TestUserContentPackage exte
admin.save();
File tmpFile = createPackage("test", "test", u.getPath());
- u.remove();
- 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 {
+ u.remove();
+ 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());
+ } finally {
+ tmpFile.delete();
+ }
}
@Test
@@ -301,21 +304,25 @@ public class TestUserContentPackage exte
admin.save();
File tmpFile = createPackage("test", "test", u.getPath());
- u.remove();
- 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 {
+ u.remove();
+ 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());
+ } finally {
+ tmpFile.delete();
+ }
}
/**