You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@qpid.apache.org by rg...@apache.org on 2013/08/09 17:14:00 UTC
svn commit: r1512335 - in /qpid/trunk/qpid/java:
client/src/test/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactoryTest.java
systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
test-profiles/testprofile.defaults
Author: rgodfrey
Date: Fri Aug 9 15:14:00 2013
New Revision: 1512335
URL: http://svn.apache.org/r1512335
Log:
QPID-5065 : [Java] tests do not run on Windows
Modified:
qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactoryTest.java
qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
qpid/trunk/qpid/java/test-profiles/testprofile.defaults
Modified: qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactoryTest.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactoryTest.java?rev=1512335&r1=1512334&r2=1512335&view=diff
==============================================================================
--- qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactoryTest.java (original)
+++ qpid/trunk/qpid/java/client/src/test/java/org/apache/qpid/jndi/PropertiesFileInitialContextFactoryTest.java Fri Aug 9 15:14:00 2013
@@ -115,7 +115,7 @@ public class PropertiesFileInitialContex
setTestSystemProperty(ClientProperties.DEST_SYNTAX, "ADDR");
setTestSystemProperty(InitialContext.INITIAL_CONTEXT_FACTORY, "org.apache.qpid.jndi.PropertiesFileInitialContextFactory");
- setTestSystemProperty(InitialContext.PROVIDER_URL, "file://" + f.getCanonicalPath());
+ setTestSystemProperty(InitialContext.PROVIDER_URL, f.toURI().toURL().toString());
InitialContext context = new InitialContext();
Destination dest = (Destination) context.lookup("topicExchange");
Modified: qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java?rev=1512335&r1=1512334&r2=1512335&view=diff
==============================================================================
--- qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java (original)
+++ qpid/trunk/qpid/java/systests/src/main/java/org/apache/qpid/test/utils/QpidBrokerTestCase.java Fri Aug 9 15:14:00 2013
@@ -249,20 +249,12 @@ public class QpidBrokerTestCase extends
private void initialiseLogConfigFile()
{
- try
- {
- _logger.info("About to initialise log config file from system property: " + LOG4J_CONFIG_FILE_PATH);
+ _logger.info("About to initialise log config file from system property: " + LOG4J_CONFIG_FILE_PATH);
- URI uri = new URI("file", LOG4J_CONFIG_FILE_PATH, null);
- _logConfigFile = new File(uri);
- if(!_logConfigFile.exists())
- {
- throw new RuntimeException("Log config file " + _logConfigFile.getAbsolutePath() + " does not exist");
- }
- }
- catch (URISyntaxException e)
+ _logConfigFile = new File(LOG4J_CONFIG_FILE_PATH);
+ if(!_logConfigFile.exists())
{
- throw new RuntimeException("Couldn't create URI from log4.configuration: " + LOG4J_CONFIG_FILE_PATH, e);
+ throw new RuntimeException("Log config file " + _logConfigFile.getAbsolutePath() + " does not exist");
}
}
@@ -633,17 +625,17 @@ public class QpidBrokerTestCase extends
public String getTestConfigFile(int port)
{
- return _output + "/" + getTestQueueName() + "-" + port + "-config";
+ return _output + File.separator + getTestQueueName() + "-" + port + "-config";
}
public String getTestVirtualhostsFile(int port)
{
- return _output + "/" + getTestQueueName() + "-" + port + "-virtualhosts.xml";
+ return _output + File.separator + getTestQueueName() + "-" + port + "-virtualhosts.xml";
}
private String relativeToQpidHome(String file)
{
- return file.replace(System.getProperty(QPID_HOME,"QPID_HOME") + "/","");
+ return file.replace(System.getProperty(QPID_HOME,"QPID_HOME") + File.separator,"");
}
protected String getPathRelativeToWorkingDirectory(String file)
Modified: qpid/trunk/qpid/java/test-profiles/testprofile.defaults
URL: http://svn.apache.org/viewvc/qpid/trunk/qpid/java/test-profiles/testprofile.defaults?rev=1512335&r1=1512334&r2=1512335&view=diff
==============================================================================
--- qpid/trunk/qpid/java/test-profiles/testprofile.defaults (original)
+++ qpid/trunk/qpid/java/test-profiles/testprofile.defaults Fri Aug 9 15:14:00 2013
@@ -17,7 +17,7 @@
# under the License.
#
java.naming.factory.initial=org.apache.qpid.jndi.PropertiesFileInitialContextFactory
-java.naming.provider.url=${test.profiles}/test-provider.properties
+java.naming.provider.url=${test.profiles}${file.separator}test-provider.properties
broker.ready=Listening on TCP
broker.config=build/etc/config-systests.json
@@ -36,7 +36,7 @@ root.logging.level=warn
# System property log4j.configuration is used by log4j.
# QpidBrokerTestCase uses log4j.configuration.file to construct a java.io.File, eg for log configuration of spawned brokers.
-log4j.configuration.file=${test.profiles}/log4j-test.xml
+log4j.configuration.file=${test.profiles}${file.separator}log4j-test.xml
log4j.configuration=file:///${log4j.configuration.file}
log4j.debug=false
@@ -63,6 +63,6 @@ exclude.modules=none
profile.clustered=false
broker.config-store-type=json
-broker.virtualhosts-config="${QPID_HOME}/etc/virtualhosts-systests.xml"
+broker.virtualhosts-config="${QPID_HOME}${file.separator}etc${file.separator}virtualhosts-systests.xml"
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@qpid.apache.org
For additional commands, e-mail: commits-help@qpid.apache.org