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 06:13:13 UTC
svn commit: r1867421 -
/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/
Author: reschke
Date: Tue Sep 24 06:13:13 2019
New Revision: 1867421
URL: http://svn.apache.org/viewvc?rev=1867421&view=rev
Log:
JCRVLT-376: test cases leak 'vaulttest*zip' temp files
Modified:
jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java
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/TestFilteredPropertyExport.java
jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestManifestCreationExport.java
jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestNamespaceImport.java
jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestPackageTypes.java
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java?rev=1867421&r1=1867420&r2=1867421&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/IntegrationTestBase.java Tue Sep 24 06:13:13 2019
@@ -719,19 +719,19 @@ public class IntegrationTestBase {
}
void verifyManifest(File testPackageFile, Set<String> ignoredEntries, String expected) throws IOException {
- JarFile jar = new JarFile(testPackageFile);
-
- List<String> entries = new ArrayList<String>();
- for (Map.Entry<Object, Object> e: jar.getManifest().getMainAttributes().entrySet()) {
- String key = e.getKey().toString();
- if (ignoredEntries.contains(key)) {
- continue;
+ try (JarFile jar = new JarFile(testPackageFile)) {
+ List<String> entries = new ArrayList<String>();
+ for (Map.Entry<Object, Object> e: jar.getManifest().getMainAttributes().entrySet()) {
+ String key = e.getKey().toString();
+ if (ignoredEntries.contains(key)) {
+ continue;
+ }
+ entries.add(e.getKey() + ":" + e.getValue());
}
- entries.add(e.getKey() + ":" + e.getValue());
+ Collections.sort(entries);
+ String result = Text.implode(entries.toArray(new String[entries.size()]),"\n");
+ assertEquals("Manifest", expected, result);
}
- Collections.sort(entries);
- String result = Text.implode(entries.toArray(new String[entries.size()]),"\n");
- assertEquals("Manifest", expected, result);
}
}
\ No newline at end of file
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=1867421&r1=1867420&r2=1867421&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 06:13:13 2019
@@ -115,22 +115,26 @@ public class TestEscapedExport extends I
private void assembleAndReinstallPackage() throws IOException, PackageException, RepositoryException {
File pkgFile = File.createTempFile("vaulttest", ".zip");
- ExportOptions options = new ExportOptions();
- DefaultMetaInf meta = new DefaultMetaInf();
- DefaultWorkspaceFilter filter = new DefaultWorkspaceFilter();
- filter.add(new PathFilterSet("/tmp"));
- meta.setFilter(filter);
+ try {
+ ExportOptions options = new ExportOptions();
+ DefaultMetaInf meta = new DefaultMetaInf();
+ DefaultWorkspaceFilter filter = new DefaultWorkspaceFilter();
+ filter.add(new PathFilterSet("/tmp"));
+ meta.setFilter(filter);
- Properties props = new Properties();
- props.setProperty(VaultPackage.NAME_GROUP, "jackrabbit/test");
- props.setProperty(VaultPackage.NAME_NAME, "filtered-export-package");
- meta.setProperties(props);
- options.setMetaInf(meta);
+ Properties props = new Properties();
+ props.setProperty(VaultPackage.NAME_GROUP, "jackrabbit/test");
+ props.setProperty(VaultPackage.NAME_NAME, "filtered-export-package");
+ meta.setProperties(props);
+ options.setMetaInf(meta);
- packMgr.assemble(admin, options, pkgFile).close();
+ packMgr.assemble(admin, options, pkgFile).close();
- clean("/tmp");
- packMgr.open(pkgFile).extract(admin, getDefaultOptions());
+ clean("/tmp");
+ packMgr.open(pkgFile).extract(admin, getDefaultOptions());
+ } finally {
+ pkgFile.delete();
+ }
}
}
\ No newline at end of file
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestFilteredPropertyExport.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestFilteredPropertyExport.java?rev=1867421&r1=1867420&r2=1867421&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestFilteredPropertyExport.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestFilteredPropertyExport.java Tue Sep 24 06:13:13 2019
@@ -58,11 +58,15 @@ public class TestFilteredPropertyExport
// export and extract
File pkgFile = assemblePackage(filter);
clean("/tmp");
- packMgr.open(pkgFile).extract(admin, getDefaultOptions());
- // validate the extracted content
- assertPropertiesExist("/tmp", "p1", "p2", "p3");
- assertPropertiesExist("/tmp/foo", "p1", "p2", "p3");
- assertPropertiesExist("/tmp/foo/bar", "p1", "p2", "p3");
+ try (VaultPackage vp = packMgr.open(pkgFile)) {
+ vp.extract(admin, getDefaultOptions());
+ // validate the extracted content
+ assertPropertiesExist("/tmp", "p1", "p2", "p3");
+ assertPropertiesExist("/tmp/foo", "p1", "p2", "p3");
+ assertPropertiesExist("/tmp/foo/bar", "p1", "p2", "p3");
+ } finally {
+ pkgFile.delete();
+ }
}
@Test
@@ -73,11 +77,15 @@ public class TestFilteredPropertyExport
// export and extract
File pkgFile = assemblePackage(filter);
clean("/tmp");
- packMgr.open(pkgFile).extract(admin, getDefaultOptions());
- // validate the extracted content
- assertPropertiesExist("/tmp", "p1", "p2", "p3");
- assertPropertiesExist("/tmp/foo", "p1", "p2", "p3");
- assertPropertiesExist("/tmp/foo/bar", "p1", "p2", "p3");
+ try (VaultPackage vp = packMgr.open(pkgFile)) {
+ vp.extract(admin, getDefaultOptions());
+ // validate the extracted content
+ assertPropertiesExist("/tmp", "p1", "p2", "p3");
+ assertPropertiesExist("/tmp/foo", "p1", "p2", "p3");
+ assertPropertiesExist("/tmp/foo/bar", "p1", "p2", "p3");
+ } finally {
+ pkgFile.delete();
+ }
}
@Test
@@ -91,12 +99,16 @@ public class TestFilteredPropertyExport
// export and extract
File pkgFile = assemblePackage(filter);
clean("/tmp");
- packMgr.open(pkgFile).extract(admin, getDefaultOptions());
- // validate the extracted content
- assertPropertiesExist("/tmp", "p1", "p2", "p3");
- assertPropertiesExist("/tmp/foo", "p2", "p3");
- assertPropertiesMissg("/tmp/foo", "p1");
- assertPropertiesExist("/tmp/foo/bar", "p1", "p2", "p3");
+ try (VaultPackage vp = packMgr.open(pkgFile)) {
+ vp.extract(admin, getDefaultOptions());
+ // validate the extracted content
+ assertPropertiesExist("/tmp", "p1", "p2", "p3");
+ assertPropertiesExist("/tmp/foo", "p2", "p3");
+ assertPropertiesMissg("/tmp/foo", "p1");
+ assertPropertiesExist("/tmp/foo/bar", "p1", "p2", "p3");
+ } finally {
+ pkgFile.delete();
+ }
}
@Test
@@ -110,12 +122,16 @@ public class TestFilteredPropertyExport
// export and extract
File pkgFile = assemblePackage(filter);
clean("/tmp");
- packMgr.open(pkgFile).extract(admin, getDefaultOptions());
- // validate the extracted content
- assertPropertiesExist("/tmp", "p1", "p2", "p3");
- assertPropertiesExist("/tmp/foo", "p2", "p3");
- assertPropertiesMissg("/tmp/foo", "p1");
- assertPropertiesExist("/tmp/foo/bar", "p1", "p2", "p3");
+ try (VaultPackage vp = packMgr.open(pkgFile)) {
+ vp.extract(admin, getDefaultOptions());
+ // validate the extracted content
+ assertPropertiesExist("/tmp", "p1", "p2", "p3");
+ assertPropertiesExist("/tmp/foo", "p2", "p3");
+ assertPropertiesMissg("/tmp/foo", "p1");
+ assertPropertiesExist("/tmp/foo/bar", "p1", "p2", "p3");
+ } finally {
+ pkgFile.delete();
+ }
}
@Test
@@ -129,11 +145,15 @@ public class TestFilteredPropertyExport
// export and extract
File pkgFile = assemblePackage(filter);
clean("/tmp");
- packMgr.open(pkgFile).extract(admin, getDefaultOptions());
- // validate the extracted content
- assertPropertiesExist("/tmp", "p1", "p2", "p3");
- assertPropertiesMissg("/tmp/foo", "p1", "p2", "p3");
- assertPropertiesExist("/tmp/foo/bar", "p1", "p2", "p3");
+ try (VaultPackage vp = packMgr.open(pkgFile)) {
+ vp.extract(admin, getDefaultOptions());
+ // validate the extracted content
+ assertPropertiesExist("/tmp", "p1", "p2", "p3");
+ assertPropertiesMissg("/tmp/foo", "p1", "p2", "p3");
+ assertPropertiesExist("/tmp/foo/bar", "p1", "p2", "p3");
+ } finally {
+ pkgFile.delete();
+ }
}
@Test
@@ -148,11 +168,15 @@ public class TestFilteredPropertyExport
// export and extract
File pkgFile = assemblePackage(filter);
clean("/tmp");
- packMgr.open(pkgFile).extract(admin, getDefaultOptions());
- // validate the extracted content
- assertPropertiesExist("/tmp", "p1", "p2", "p3");
- assertPropertiesMissg("/tmp/foo", "p1", "p2", "p3");
- assertPropertiesExist("/tmp/foo/bar", "p1", "p2", "p3");
+ try (VaultPackage vp = packMgr.open(pkgFile)) {
+ vp.extract(admin, getDefaultOptions());
+ // validate the extracted content
+ assertPropertiesExist("/tmp", "p1", "p2", "p3");
+ assertPropertiesMissg("/tmp/foo", "p1", "p2", "p3");
+ assertPropertiesExist("/tmp/foo/bar", "p1", "p2", "p3");
+ } finally {
+ pkgFile.delete();
+ }
}
@Test
@@ -167,11 +191,15 @@ public class TestFilteredPropertyExport
// export and extract
File pkgFile = assemblePackage(filter);
clean("/tmp");
- packMgr.open(pkgFile).extract(admin, getDefaultOptions());
- // validate the extracted content
- assertPropertiesExist("/tmp", "p1", "p2", "p3");
- assertPropertiesMissg("/tmp/foo", "p1", "p2", "p3");
- assertPropertiesExist("/tmp/foo/bar", "p1", "p2", "p3");
+ try (VaultPackage vp = packMgr.open(pkgFile)) {
+ vp.extract(admin, getDefaultOptions());
+ // validate the extracted content
+ assertPropertiesExist("/tmp", "p1", "p2", "p3");
+ assertPropertiesMissg("/tmp/foo", "p1", "p2", "p3");
+ assertPropertiesExist("/tmp/foo/bar", "p1", "p2", "p3");
+ } finally {
+ pkgFile.delete();
+ }
}
@Test
@@ -189,11 +217,15 @@ public class TestFilteredPropertyExport
// export and extract
File pkgFile = assemblePackage(filter);
clean("/tmp");
- packMgr.open(pkgFile).extract(admin, getDefaultOptions());
- // validate the extracted content
- assertPropertiesExist("/tmp", "p1", "p2", "p3");
- assertPropertiesMissg("/tmp/foo", "p1", "p2", "p3");
- assertPropertiesExist("/tmp/foo/bar", "p1", "p2", "p3");
+ try (VaultPackage vp = packMgr.open(pkgFile)) {
+ vp.extract(admin, getDefaultOptions());
+ // validate the extracted content
+ assertPropertiesExist("/tmp", "p1", "p2", "p3");
+ assertPropertiesMissg("/tmp/foo", "p1", "p2", "p3");
+ assertPropertiesExist("/tmp/foo/bar", "p1", "p2", "p3");
+ } finally {
+ pkgFile.delete();
+ }
}
@Test
@@ -212,11 +244,15 @@ public class TestFilteredPropertyExport
// export and extract
File pkgFile = assemblePackage(filter);
clean("/tmp");
- packMgr.open(pkgFile).extract(admin, getDefaultOptions());
- // validate the extracted content
- assertPropertiesExist("/tmp", "p1", "p2", "p3");
- assertPropertiesMissg("/tmp/foo", "p1", "p2", "p3");
- assertPropertiesExist("/tmp/foo/bar", "p1", "p2", "p3");
+ try (VaultPackage vp = packMgr.open(pkgFile)) {
+ vp.extract(admin, getDefaultOptions());
+ // validate the extracted content
+ assertPropertiesExist("/tmp", "p1", "p2", "p3");
+ assertPropertiesMissg("/tmp/foo", "p1", "p2", "p3");
+ assertPropertiesExist("/tmp/foo/bar", "p1", "p2", "p3");
+ } finally {
+ pkgFile.delete();
+ }
}
@Test
@@ -230,14 +266,18 @@ public class TestFilteredPropertyExport
// export and extract
File pkgFile = assemblePackage(filter);
clean("/tmp");
- packMgr.open(pkgFile).extract(admin, getDefaultOptions());
- // validate the extracted content
- assertPropertiesExist("/tmp", "p2", "p3");
- assertPropertiesMissg("/tmp", "p1");
- assertPropertiesExist("/tmp/foo", "p2", "p3");
- assertPropertiesMissg("/tmp/foo", "p1");
- assertPropertiesExist("/tmp/foo/bar", "p2", "p3");
- assertPropertiesMissg("/tmp/foo/bar", "p1");
+ try (VaultPackage vp = packMgr.open(pkgFile)) {
+ vp.extract(admin, getDefaultOptions());
+ // validate the extracted content
+ assertPropertiesExist("/tmp", "p2", "p3");
+ assertPropertiesMissg("/tmp", "p1");
+ assertPropertiesExist("/tmp/foo", "p2", "p3");
+ assertPropertiesMissg("/tmp/foo", "p1");
+ assertPropertiesExist("/tmp/foo/bar", "p2", "p3");
+ assertPropertiesMissg("/tmp/foo/bar", "p1");
+ } finally {
+ pkgFile.delete();
+ }
}
@Test
@@ -251,14 +291,18 @@ public class TestFilteredPropertyExport
// export and extract
File pkgFile = assemblePackage(filter);
clean("/tmp");
- packMgr.open(pkgFile).extract(admin, getDefaultOptions());
- // validate the extracted content
- assertPropertiesExist("/tmp", "p2", "p3");
- assertPropertiesMissg("/tmp", "p1");
- assertPropertiesExist("/tmp/foo", "p2", "p3");
- assertPropertiesMissg("/tmp/foo", "p1");
- assertPropertiesExist("/tmp/foo/bar", "p2", "p3");
- assertPropertiesMissg("/tmp/foo/bar", "p1");
+ try (VaultPackage vp = packMgr.open(pkgFile)) {
+ vp.extract(admin, getDefaultOptions());
+ // validate the extracted content
+ assertPropertiesExist("/tmp", "p2", "p3");
+ assertPropertiesMissg("/tmp", "p1");
+ assertPropertiesExist("/tmp/foo", "p2", "p3");
+ assertPropertiesMissg("/tmp/foo", "p1");
+ assertPropertiesExist("/tmp/foo/bar", "p2", "p3");
+ assertPropertiesMissg("/tmp/foo/bar", "p1");
+ } finally {
+ pkgFile.delete();
+ }
}
@Test
@@ -271,11 +315,15 @@ public class TestFilteredPropertyExport
File pkgFile = assemblePackage(filter);
clean("/tmp");
- packMgr.open(pkgFile).extract(admin, getDefaultOptions());
- // validate the extracted content
- assertPropertiesExist("/tmp", "p1", "p2", "p3");
- assertPropertiesExist("/tmp/foo", "p1", "p2", "p3");
- assertPropertiesExist("/tmp/foo/bar", "p1", "p2", "p3");
+ try (VaultPackage vp = packMgr.open(pkgFile)) {
+ vp.extract(admin, getDefaultOptions());
+ // validate the extracted content
+ assertPropertiesExist("/tmp", "p1", "p2", "p3");
+ assertPropertiesExist("/tmp/foo", "p1", "p2", "p3");
+ assertPropertiesExist("/tmp/foo/bar", "p1", "p2", "p3");
+ } finally {
+ pkgFile.delete();
+ }
}
@Test
@@ -289,11 +337,15 @@ public class TestFilteredPropertyExport
filter.add(nodes, props);
File pkgFile = assemblePackage(filter);
clean("/tmp");
- packMgr.open(pkgFile).extract(admin, getDefaultOptions());
- // validate the extracted content
- assertPropertiesExist("/tmp", "p1", "p2", "p3");
- assertNodeMissing("/tmp/foo");
- assertNodeMissing("/tmp/foo/bar");
+ try (VaultPackage vp = packMgr.open(pkgFile)) {
+ vp.extract(admin, getDefaultOptions());
+ // validate the extracted content
+ assertPropertiesExist("/tmp", "p1", "p2", "p3");
+ assertNodeMissing("/tmp/foo");
+ assertNodeMissing("/tmp/foo/bar");
+ } finally {
+ pkgFile.delete();
+ }
}
@Test
@@ -308,12 +360,16 @@ public class TestFilteredPropertyExport
filter.add(nodes, props);
File pkgFile = assemblePackage(filter);
clean("/tmp");
- packMgr.open(pkgFile).extract(admin, getDefaultOptions());
- // validate the extracted content
- assertPropertiesExist("/tmp", "p2", "p3");
- assertPropertiesMissg("/tmp", "p1");
- assertNodeMissing("/tmp/foo");
- assertNodeMissing("/tmp/foo/bar");
+ try (VaultPackage vp = packMgr.open(pkgFile)) {
+ vp.extract(admin, getDefaultOptions());
+ // validate the extracted content
+ assertPropertiesExist("/tmp", "p2", "p3");
+ assertPropertiesMissg("/tmp", "p1");
+ assertNodeMissing("/tmp/foo");
+ assertNodeMissing("/tmp/foo/bar");
+ } finally {
+ pkgFile.delete();
+ }
}
@Test
@@ -328,11 +384,15 @@ public class TestFilteredPropertyExport
// export and extract
File pkgFile = assemblePackage(filter);
clean("/tmp");
- packMgr.open(pkgFile).extract(admin, getDefaultOptions());
- // validate the extracted content
- assertPropertiesExist("/tmp", "p1", "p2", "p3");
- assertNodeMissing("/tmp/foo");
- assertNodeMissing("/tmp/foo/bar");
+ try (VaultPackage vp = packMgr.open(pkgFile)) {
+ vp.extract(admin, getDefaultOptions());
+ // validate the extracted content
+ assertPropertiesExist("/tmp", "p1", "p2", "p3");
+ assertNodeMissing("/tmp/foo");
+ assertNodeMissing("/tmp/foo/bar");
+ } finally {
+ pkgFile.delete();
+ }
}
@Test
@@ -350,11 +410,15 @@ public class TestFilteredPropertyExport
// export and extract
File pkgFile = assemblePackage(filter);
clean("/tmp");
- packMgr.open(pkgFile).extract(admin, getDefaultOptions());
- // validate the extracted content
- assertPropertiesExist("/tmp", "p1", "p2", "p3");
- assertNodeMissing("/tmp/foo");
- assertNodeMissing("/tmp/foo/bar");
+ try (VaultPackage vp = packMgr.open(pkgFile)) {
+ vp.extract(admin, getDefaultOptions());
+ // validate the extracted content
+ assertPropertiesExist("/tmp", "p1", "p2", "p3");
+ assertNodeMissing("/tmp/foo");
+ assertNodeMissing("/tmp/foo/bar");
+ } finally {
+ pkgFile.delete();
+ }
}
/**
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestManifestCreationExport.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestManifestCreationExport.java?rev=1867421&r1=1867420&r2=1867421&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestManifestCreationExport.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestManifestCreationExport.java Tue Sep 24 06:13:13 2019
@@ -61,19 +61,19 @@ public class TestManifestCreationExport
inf.setProperties(props);
opts.setMetaInf(inf);
- File tmpFile = File.createTempFile("vaulttest", ".zip");
- VaultPackage pkg = packMgr.assemble(admin, opts, tmpFile);
-
- String expected =
- "Content-Package-Dependencies:foo:bar:[1.0,2.0)\n" +
- "Content-Package-Description:This is a test package.\n" +
- "Content-Package-Id:jackrabbit/test:test-package\n" +
- "Content-Package-Roots:/tmp/foo/bar,/tmp/foo/zoo\n" +
- "Content-Package-Type:content\n" +
- "Manifest-Version:1.0";
- verifyManifest(tmpFile, Collections.<String>emptySet(), expected);
- tmpFile.delete();
- pkg.close();
+ File tmpFile = File.createTempFile("e-vaulttest", ".zip");
+ try (VaultPackage pkg = packMgr.assemble(admin, opts, tmpFile)) {
+ String expected =
+ "Content-Package-Dependencies:foo:bar:[1.0,2.0)\n" +
+ "Content-Package-Description:This is a test package.\n" +
+ "Content-Package-Id:jackrabbit/test:test-package\n" +
+ "Content-Package-Roots:/tmp/foo/bar,/tmp/foo/zoo\n" +
+ "Content-Package-Type:content\n" +
+ "Manifest-Version:1.0";
+ verifyManifest(tmpFile, Collections.<String>emptySet(), expected);
+ } finally {
+ tmpFile.delete();
+ }
}
}
\ No newline at end of file
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestNamespaceImport.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestNamespaceImport.java?rev=1867421&r1=1867420&r2=1867421&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestNamespaceImport.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestNamespaceImport.java Tue Sep 24 06:13:13 2019
@@ -86,17 +86,19 @@ public class TestNamespaceImport {
opts.setMetaInf(inf);
File tmpFile = File.createTempFile("vaulttest", "zip");
- VaultPackage pkg = i1.packMgr.assemble(i1.admin, opts, tmpFile);
- Archive archive = pkg.getArchive();
+ try (VaultPackage pkg = i1.packMgr.assemble(i1.admin, opts, tmpFile)) {
+ Archive archive = pkg.getArchive();
- // Import the archive in the instance i2, with strict mode enabled
-
- ImportOptions io = new ImportOptions();
- io.setStrict(true);
- i2.packMgr.extract(archive, io, true);
-
- assertEquals(i2.getRootNode().getNode("tmp").getProperty("{" + URI1 + "}prop1").getString(), "value1");
+ // Import the archive in the instance i2, with strict mode enabled
+ ImportOptions io = new ImportOptions();
+ io.setStrict(true);
+ i2.packMgr.extract(archive, io, true);
+
+ assertEquals(i2.getRootNode().getNode("tmp").getProperty("{" + URI1 + "}prop1").getString(), "value1");
+ } finally {
+ tmpFile.delete();
+ }
}
@Test
@@ -120,19 +122,22 @@ public class TestNamespaceImport {
opts.setMetaInf(inf);
File tmpFile = File.createTempFile("vaulttest", "zip");
- VaultPackage pkg = i1.packMgr.assemble(i1.admin, opts, tmpFile);
- Archive archive = pkg.getArchive();
-
- // Import the archive in the instance i2, with strict mode enabled
-
- ImportOptions io = new ImportOptions();
- io.setStrict(true);
- i2.packMgr.extract(archive, io, true);
+ try (VaultPackage pkg = i1.packMgr.assemble(i1.admin, opts, tmpFile)) {
+ Archive archive = pkg.getArchive();
- assertEquals(i2.getRootNode().getProperty("tmp/{" + URI1 + "}node1/test").getString(), "value1");
+ // Import the archive in the instance i2, with strict mode enabled
- i2.relogin();
- assertNotEquals(PREFIX, i2.admin.getNamespacePrefix(URI1));
+ ImportOptions io = new ImportOptions();
+ io.setStrict(true);
+ i2.packMgr.extract(archive, io, true);
+
+ assertEquals(i2.getRootNode().getProperty("tmp/{" + URI1 + "}node1/test").getString(), "value1");
+
+ i2.relogin();
+ assertNotEquals(PREFIX, i2.admin.getNamespacePrefix(URI1));
+ } finally {
+ tmpFile.delete();
+ }
}
private static final class Instance {
Modified: jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestPackageTypes.java
URL: http://svn.apache.org/viewvc/jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestPackageTypes.java?rev=1867421&r1=1867420&r2=1867421&view=diff
==============================================================================
--- jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestPackageTypes.java (original)
+++ jackrabbit/commons/filevault/trunk/vault-core/src/test/java/org/apache/jackrabbit/vault/packaging/integration/TestPackageTypes.java Tue Sep 24 06:13:13 2019
@@ -69,8 +69,6 @@ public class TestPackageTypes extends In
private void verifyPackageTypeViaPackageCreation(WorkspaceFilter filter, PackageType expected)
throws IOException, RepositoryException {
- File tmpFile = File.createTempFile("vaulttest", "zip");
-
ExportOptions options = new ExportOptions();
DefaultMetaInf meta = new DefaultMetaInf();
meta.setFilter(filter);
@@ -81,9 +79,13 @@ public class TestPackageTypes extends In
meta.setProperties(props);
options.setMetaInf(meta);
+
+ File tmpFile = File.createTempFile("vaulttest", "zip");
try (VaultPackage pkg = packMgr.assemble(admin, options, tmpFile)) {
PackageType result = pkg.getProperties().getPackageType();
assertEquals("Package type", expected, result);
+ } finally {
+ tmpFile.delete();
}
}