[KARAF-2558] Fix unit tests on Windows
Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/6650922f Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/6650922f Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/6650922f Branch: refs/heads/master Commit: 6650922facc3779bd776aeb518c9e4bd993b2476 Parents: 2a8a033 Author: Jean-Baptiste Onofré <[email protected]> Authored: Sat Dec 21 07:23:04 2013 +0100 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Sat Dec 21 07:23:04 2013 +0100 ---------------------------------------------------------------------- .../jaas/modules/properties/PropertiesLoginModuleTest.java | 6 ++---- main/src/test/java/org/apache/karaf/main/MainStartTest.java | 6 ++---- 2 files changed, 4 insertions(+), 8 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/6650922f/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModuleTest.java ---------------------------------------------------------------------- diff --git a/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModuleTest.java b/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModuleTest.java index 7ba689c..d9eaf97 100644 --- a/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModuleTest.java +++ b/jaas/modules/src/test/java/org/apache/karaf/jaas/modules/properties/PropertiesLoginModuleTest.java @@ -254,11 +254,9 @@ public class PropertiesLoginModuleTest { @Test public void testNonExistantPropertiesFile() throws LoginException, IOException, UnsupportedCallbackException { try { - testWithUsersFile("/test/users.properties"); + testWithUsersFile(File.separator + "test" + File.separator + "users.properties"); } catch (LoginException e) { - String message = e.getMessage(); - message = message.replace("\\", "/"); - Assert.assertEquals("Users file not found at /test/users.properties", message); + Assert.assertEquals("Users file not found at " + File.separator + "test" + File.separator + "users.properties", e.getMessage()); } } http://git-wip-us.apache.org/repos/asf/karaf/blob/6650922f/main/src/test/java/org/apache/karaf/main/MainStartTest.java ---------------------------------------------------------------------- diff --git a/main/src/test/java/org/apache/karaf/main/MainStartTest.java b/main/src/test/java/org/apache/karaf/main/MainStartTest.java index ce68b66..94b1d37 100644 --- a/main/src/test/java/org/apache/karaf/main/MainStartTest.java +++ b/main/src/test/java/org/apache/karaf/main/MainStartTest.java @@ -22,7 +22,6 @@ import java.io.File; import junit.framework.Assert; -import org.apache.karaf.main.util.Utils; import org.junit.After; import org.junit.Test; import org.osgi.framework.Bundle; @@ -43,9 +42,8 @@ public class MainStartTest { public void testAutoStart() throws Exception { File basedir = new File(getClass().getClassLoader().getResource("foo").getPath()).getParentFile(); File home = new File(basedir, "test-karaf-home"); - File data = new File(home, "data"); - - Utils.deleteDirectory(data); + // generate an unique folder name to avoid conflict with folder created by other unit tests (KARAF-2558) + File data = new File(home, "data" + System.currentTimeMillis()); String[] args = new String[0]; System.setProperty("karaf.home", home.toString());
