diff options
author | Alexander Kurtakov | 2014-07-03 19:21:48 +0000 |
---|---|---|
committer | Alexander Kurtakov | 2017-05-05 11:57:40 +0000 |
commit | d1f4f0943d1bb1d644b8ef52ab2bec0e25b2f46f (patch) | |
tree | 90ed1bafa7b36e598867cb53573a8f6ce3307911 | |
parent | 89e924e1e1c2d97841a72e5d29da604299037388 (diff) | |
download | rt.equinox.p2-I20170506-2000.tar.gz rt.equinox.p2-I20170506-2000.tar.xz rt.equinox.p2-I20170506-2000.zip |
Bug 438584 - p2 unit tests not cleaning up after themselvesI20170510-0800I20170509-2000I20170509-1300I20170509-1100I20170509-0945I20170509-0800I20170508-2000I20170508-0800I20170507-2000I20170506-2000I20170505-2000
Change-Id: I651c22e089d17929f00ee086e3de6910ef901266
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>
4 files changed, 18 insertions, 1 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/ArtifactLockingTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/ArtifactLockingTest.java index 147c8c546..f66e38a34 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/ArtifactLockingTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/artifact/repository/ArtifactLockingTest.java @@ -47,6 +47,7 @@ public class ArtifactLockingTest extends AbstractProvisioningTest { @Override protected void tearDown() throws Exception { System.setProperty(Activator.ENABLE_ARTIFACT_LOCKING, "" + lockingValue); + targetLocation.delete(); super.tearDown(); } diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/EquinoxExecutableActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/EquinoxExecutableActionTest.java index 158f66e45..9fd739350 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/EquinoxExecutableActionTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/EquinoxExecutableActionTest.java @@ -64,6 +64,9 @@ public class EquinoxExecutableActionTest extends ActionTest { expectedExecutablesContents = new String[] {"Info.plist", "MacOS/" + EXECUTABLE_NAME, "MacOS/" + EXECUTABLE_NAME + ".ini", "Resources/" + icon.getName()}; testExecutableAction("macCocoa", "macosx", macConfigCocoa, MAC_EXEC, icon); //$NON-NLS-1$//$NON-NLS-2$ + + // cleanup + icon.delete(); } public void testWin() throws Exception { @@ -73,6 +76,9 @@ public class EquinoxExecutableActionTest extends ActionTest { // FIXME: is there any way to test that the .ico has been replaced? expectedExecutablesContents = new String[] {EXECUTABLE_NAME + ".exe"}; testExecutableAction("win", "win32", winConfig, WIN_EXEC, icon); //$NON-NLS-1$//$NON-NLS-2$ + + // cleanup + icon.delete(); } public void testLinux() throws Exception { @@ -81,6 +87,9 @@ public class EquinoxExecutableActionTest extends ActionTest { expectedExecutablesContents = new String[] {EXECUTABLE_NAME, "icon.xpm"}; testExecutableAction("linux", "linux", linuxConfig, LINUX_EXEC, icon); //$NON-NLS-1$//$NON-NLS-2$ + + // cleanup + icon.delete(); } private void testExecutableAction(String idBase, final String osArg, String config, File exec, File icon) { @@ -198,6 +207,9 @@ public class EquinoxExecutableActionTest extends ActionTest { } finally { zip.close(); } + + // cleanup + file.delete(); } /** diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/repository/CacheManagerTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/repository/CacheManagerTest.java index 1fdfb232f..ca633192a 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/repository/CacheManagerTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/repository/CacheManagerTest.java @@ -85,6 +85,7 @@ public class CacheManagerTest extends TestCase { private URI createRepistory() throws IOException { File repository = File.createTempFile("remoteFile", ""); //$NON-NLS-1$//$NON-NLS-2$ + repository.deleteOnExit(); assertTrue(repository.delete()); assertTrue(repository.mkdirs()); IPath contentXmlPath = new Path(repository.getAbsolutePath()).append("content.xml"); //$NON-NLS-1$ diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/RmdirActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/RmdirActionTest.java index 35c6df779..f629943cf 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/RmdirActionTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/touchpoint/natives/RmdirActionTest.java @@ -64,5 +64,8 @@ public class RmdirActionTest extends AbstractProvisioningTest { assertTrue(testFolder.exists()); if (store != null) store.discard(); + + // cleanup + testFolder.delete(); } -}
\ No newline at end of file +} |