Updated Branches: refs/heads/karaf-2.3.x c9227c98f -> 0c2d8c629
[KARAF-2558] Fix unit tests on Windows platform Project: http://git-wip-us.apache.org/repos/asf/karaf/repo Commit: http://git-wip-us.apache.org/repos/asf/karaf/commit/0c2d8c62 Tree: http://git-wip-us.apache.org/repos/asf/karaf/tree/0c2d8c62 Diff: http://git-wip-us.apache.org/repos/asf/karaf/diff/0c2d8c62 Branch: refs/heads/karaf-2.3.x Commit: 0c2d8c629645fbbf28e38f63fc9d634e83d66163 Parents: c9227c9 Author: Jean-Baptiste Onofré <[email protected]> Authored: Sat Dec 21 07:35:49 2013 +0100 Committer: Jean-Baptiste Onofré <[email protected]> Committed: Sat Dec 21 07:37:42 2013 +0100 ---------------------------------------------------------------------- .../jaas/modules/properties/PropertiesLoginModuleTest.java | 8 ++------ main/src/test/java/org/apache/karaf/main/MainStartTest.java | 6 ++---- 2 files changed, 4 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/karaf/blob/0c2d8c62/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 aee81ca..459ef4e 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 @@ -45,13 +45,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("\\", "/"); - String test = "Users file not found at " + File.separator + - "test" + File.separator + "users.properties"; - Assert.assertEquals(test, 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/0c2d8c62/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 cc9f8d5..34d8ed8 100644 --- a/main/src/test/java/org/apache/karaf/main/MainStartTest.java +++ b/main/src/test/java/org/apache/karaf/main/MainStartTest.java @@ -21,7 +21,6 @@ package org.apache.karaf.main; import static org.ops4j.pax.swissbox.tinybundles.core.TinyBundles.withBnd; import java.io.File; -import java.net.URI; import junit.framework.Assert; @@ -39,9 +38,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); + // create an unique data folder to avoid conflict with other unit tests (KARAF-2558) + File data = new File(home, "data" + System.currentTimeMillis()); String[] args = new String[0]; String fileMVNbundle = new File(home, "bundles/pax-url-mvn.jar").toURI().toURL().toExternalForm();
