diff options
Diffstat (limited to 'qpid/java')
3 files changed, 14 insertions, 5 deletions
diff --git a/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackupTest.java b/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackupTest.java index 7c04d83e79..73eaf363ad 100644 --- a/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackupTest.java +++ b/qpid/java/bdbstore/systests/src/main/java/org/apache/qpid/server/store/berkeleydb/BDBBackupTest.java @@ -134,7 +134,7 @@ public class BDBBackupTest extends QpidBrokerTestCase private void invokeBdbBackup(final File backupFromDir, final File backupToDir) throws Exception { - if (String.valueOf(System.getProperty("os.name")).toLowerCase().contains("windows")) + if (IS_OS_WINDOWS) { BDBBackup.main(new String[]{"-todir", backupToDir.getAbsolutePath(), "-fromdir", backupFromDir.getAbsolutePath()}); } diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java index 1d2f6e3427..b5d036c9e4 100644 --- a/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/systest/rest/BrokerRestTest.java @@ -237,7 +237,7 @@ public class BrokerRestTest extends QpidRestTestCase assertEquals("Unexpected value of attribute " + Broker.BUILD_VERSION, QpidProperties.getBuildVersion(), brokerDetails.get(Broker.BUILD_VERSION)); - assertEquals("Unexpected value of attribute " + Broker.OPERATING_SYSTEM, System.getProperty("os.name") + " " + assertEquals("Unexpected value of attribute " + Broker.OPERATING_SYSTEM, OS_NAME + " " + System.getProperty("os.version") + " " + System.getProperty("os.arch"), brokerDetails.get(Broker.OPERATING_SYSTEM)); assertEquals( diff --git a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java index c3b3090f1f..8e380a65a1 100755 --- a/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java +++ b/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java @@ -158,6 +158,8 @@ public class QpidBrokerTestCase extends QpidTestCase public static final int FAILING_PORT = Integer.parseInt(System.getProperty("test.port.alt")); public static final int DEFAULT_MANAGEMENT_PORT = Integer.getInteger("test.mport", DEFAULT_JMXPORT_REGISTRYSERVER); public static final int DEFAULT_SSL_PORT = Integer.getInteger("test.port.ssl", DEFAULT_SSL_PORT_VALUE); + public static final String OS_NAME = System.getProperty("os.name"); + public static final boolean IS_OS_WINDOWS = String.valueOf(OS_NAME).toLowerCase().contains("windows"); protected String _brokerLanguage = System.getProperty(BROKER_LANGUAGE, JAVA); protected BrokerType _brokerType = BrokerType.valueOf(System.getProperty(BROKER_TYPE, "").toUpperCase()); @@ -649,12 +651,19 @@ public class QpidBrokerTestCase extends QpidTestCase try { - if(!configLocation.getAbsolutePath().startsWith(workingDirectory.getCanonicalPath())) + String configPath = configLocation.getAbsolutePath(); + String workingDirectoryPath = workingDirectory.getCanonicalPath(); + if (IS_OS_WINDOWS) { - throw new RuntimeException("Provided path is not a child of the working directory: " + workingDirectory.getCanonicalPath()); + configPath = configPath.toLowerCase(); + workingDirectoryPath = workingDirectoryPath.toLowerCase(); + } + if(!configPath.startsWith(workingDirectoryPath)) + { + throw new RuntimeException("Provided path is not a child of the working directory: " + workingDirectoryPath); } - String substring = configLocation.getAbsolutePath().replace(workingDirectory.getCanonicalPath(), "").substring(1); + String substring = configPath.replace(workingDirectoryPath, "").substring(1); _logger.debug("Converted relative path: " + substring); return substring; |