Author: tchemit Date: 2010-09-08 14:43:36 +0200 (Wed, 08 Sep 2010) New Revision: 757 Url: http://nuiton.org/repositories/revision/maven-helper-plugin/757 Log: Anomalie #857: Can not execute tests on windows os Modified: trunk/src/test/java/org/nuiton/plugin/AbstractMojoTest.java trunk/src/test/java/org/nuiton/plugin/PluginHelperTest.java trunk/src/test/java/org/nuiton/plugin/TestHelper.java Modified: trunk/src/test/java/org/nuiton/plugin/AbstractMojoTest.java =================================================================== --- trunk/src/test/java/org/nuiton/plugin/AbstractMojoTest.java 2010-08-29 14:20:23 UTC (rev 756) +++ trunk/src/test/java/org/nuiton/plugin/AbstractMojoTest.java 2010-09-08 12:43:36 UTC (rev 757) @@ -145,8 +145,8 @@ // package with existing class name. String rep = getClass().getPackage().getName() + "." + Introspector.decapitalize(getClass().getSimpleName()); - rep = rep.replaceAll("\\.", File.separator); - File testDir = new File(getTestBasedir(), rep); + String[] paths = rep.split("\\."); + File testDir = TestHelper.getFile(getTestBasedir(), paths); if (isVerbose()) { log.info("test dir = " + getRelativePathFromBasedir(testDir)); } else if (log.isDebugEnabled()) { Modified: trunk/src/test/java/org/nuiton/plugin/PluginHelperTest.java =================================================================== --- trunk/src/test/java/org/nuiton/plugin/PluginHelperTest.java 2010-08-29 14:20:23 UTC (rev 756) +++ trunk/src/test/java/org/nuiton/plugin/PluginHelperTest.java 2010-09-08 12:43:36 UTC (rev 757) @@ -25,10 +25,13 @@ package org.nuiton.plugin; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; import org.junit.Assert; import org.junit.Test; import java.io.File; +import java.net.URISyntaxException; import java.net.URL; /** @@ -39,11 +42,20 @@ */ public class PluginHelperTest { + /** Logger */ + static private Log log = LogFactory.getLog(PluginHelperTest.class); + + protected File getFile() throws URISyntaxException { + URL resource = getClass().getResource("urls.txt"); + File file = new File(resource.toURI().getPath()); + log.info("file to read " + file); + Assert.assertTrue("Could not find file " + file, file.exists()); + return file; + } + @Test public void testGetLines() throws Exception { - URL resource = getClass().getResource("urls.txt"); - File file = new File(resource.getFile()); - Assert.assertTrue(file.exists()); + File file = getFile(); String[] lines = PluginHelper.getLines(file); Assert.assertNotNull(lines); Assert.assertEquals(1, lines.length); @@ -52,9 +64,7 @@ @Test public void testGetLinesAsURL() throws Exception { - URL resource = getClass().getResource("urls.txt"); - File file = new File(resource.getFile()); - Assert.assertTrue(file.exists()); + File file = getFile(); URL[] urls = PluginHelper.getLinesAsURL(file); Assert.assertNotNull(urls); Assert.assertEquals(1, urls.length); @@ -63,9 +73,7 @@ @Test public void testGetLinesAsFiles() throws Exception { - URL resource = getClass().getResource("urls.txt"); - File file = new File(resource.getFile()); - Assert.assertTrue(file.exists()); + File file = getFile(); File[] files = PluginHelper.getLinesAsFiles(file); Assert.assertNotNull(files); Assert.assertEquals(1, files.length); Modified: trunk/src/test/java/org/nuiton/plugin/TestHelper.java =================================================================== --- trunk/src/test/java/org/nuiton/plugin/TestHelper.java 2010-08-29 14:20:23 UTC (rev 756) +++ trunk/src/test/java/org/nuiton/plugin/TestHelper.java 2010-09-08 12:43:36 UTC (rev 757) @@ -72,11 +72,10 @@ } public static File getTestDir(Class<?> type, String prefix) { - String rep = type.getName(); - rep = rep.replaceAll("\\.", File.separator); - File f = new File(getBasedir(), prefix); - File testDir = new File(f, rep); + String rep = type.getName(); + String[] paths = rep.split("\\."); + File testDir = getFile(f, paths); return testDir; }