You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ta...@apache.org on 2013/02/08 20:44:27 UTC
svn commit: r1444204 -
/activemq/trunk/activemq-http/src/test/java/org/apache/activemq/transport/https/HttpsTransportBrokerTest.java
Author: tabish
Date: Fri Feb 8 19:44:27 2013
New Revision: 1444204
URL: http://svn.apache.org/r1444204
Log:
apply patch for: https://issues.apache.org/jira/browse/AMQ-4308
Modified:
activemq/trunk/activemq-http/src/test/java/org/apache/activemq/transport/https/HttpsTransportBrokerTest.java
Modified: activemq/trunk/activemq-http/src/test/java/org/apache/activemq/transport/https/HttpsTransportBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-http/src/test/java/org/apache/activemq/transport/https/HttpsTransportBrokerTest.java?rev=1444204&r1=1444203&r2=1444204&view=diff
==============================================================================
--- activemq/trunk/activemq-http/src/test/java/org/apache/activemq/transport/https/HttpsTransportBrokerTest.java (original)
+++ activemq/trunk/activemq-http/src/test/java/org/apache/activemq/transport/https/HttpsTransportBrokerTest.java Fri Feb 8 19:44:27 2013
@@ -18,15 +18,21 @@ package org.apache.activemq.transport.ht
import junit.framework.Test;
import junit.textui.TestRunner;
+
import org.apache.activemq.transport.http.HttpTransportBrokerTest;
public class HttpsTransportBrokerTest extends HttpTransportBrokerTest {
+ @Override
protected String getBindLocation() {
return "https://localhost:8161";
}
+ @Override
protected void setUp() throws Exception {
+ setAutoFail(true);
+ setMaxTestTime(300000);
+
System.setProperty("javax.net.ssl.trustStore", "src/test/resources/client.keystore");
System.setProperty("javax.net.ssl.trustStorePassword", "password");
System.setProperty("javax.net.ssl.trustStoreType", "jks");
@@ -36,7 +42,7 @@ public class HttpsTransportBrokerTest ex
//System.setProperty("javax.net.debug", "ssl,handshake,data,trustmanager");
super.setUp();
}
-
+
public static Test suite() {
return suite(HttpsTransportBrokerTest.class);
}
@@ -44,5 +50,4 @@ public class HttpsTransportBrokerTest ex
public static void main(String[] args) {
TestRunner.run(suite());
}
-
}