Apache
/
activemq-artemis
mirror of https://github.com/apache/activemq-artemis.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix FileConfigurationTest for Windows 

The test wrongly assumes that Class.getResource(..) needs to specify the
System line-separator. The contract for the method dictates:

    "If the name begins with a '/' ('\u002f'), then the absolute name of
     the resource is the portion of the name following the '/'."

Also, it manipulates File.getAbsolutePath() in a way that generates wrong
URL for Windows.
This commit is contained in:
Thiago Kronig 2015-05-14 00:26:45 -03:00
parent efb9edbc66
commit 031220b185
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
artemis-server/src/test/java/org/apache/activemq/artemis/core/config/impl/FileConfigurationTest.java
View File

@ -372,13 +372,13 @@ public class FileConfigurationTest extends ConfigurationImplTest
{ {
// copy working configuration to a location where the standard classloader cannot find it // copy working configuration to a location where the standard classloader cannot find it
final Path workingConfiguration = new File(getClass().getResource(File.separator + fullConfigurationName).toURI()).toPath(); final Path workingConfiguration = new File(getClass().getResource("/" + fullConfigurationName).toURI()).toPath();
final Path targetFile = customConfiguration.toPath(); final Path targetFile = customConfiguration.toPath();
Files.copy(workingConfiguration, targetFile, StandardCopyOption.REPLACE_EXISTING); Files.copy(workingConfiguration, targetFile, StandardCopyOption.REPLACE_EXISTING);
// build a custom classloader knowing the location of the config created above (used as context class loader) // build a custom classloader knowing the location of the config created above (used as context class loader)
final URL customConfigurationDirUrl = new URL("file://" + customConfiguration.getParentFile().getAbsolutePath() + File.separator); final URL customConfigurationDirUrl = customConfiguration.getParentFile().toURI().toURL();
final ClassLoader testWebappClassLoader = new URLClassLoader(new URL[]{customConfigurationDirUrl}); final ClassLoader testWebappClassLoader = new URLClassLoader(new URL[]{customConfigurationDirUrl});
/* /*
@ -388,7 +388,7 @@ public class FileConfigurationTest extends ConfigurationImplTest
final class ThrowableHolder final class ThrowableHolder
{ {
public Exception t = null; volatile Exception t;
} }
final ThrowableHolder holder = new ThrowableHolder(); final ThrowableHolder holder = new ThrowableHolder();