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

https://issues.apache.org/jira/browse/AMQ-4725 

temporarily apply patch to disable hanging tests
This commit is contained in:
Timothy Bish 2013-09-17 17:30:09 -04:00
parent 29b90b5812
commit 1bc55049e6
2 changed files with 108 additions and 104 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
activemq-unit-tests/src/test/java/org/apache/activemq/transport/failover/FailoverUriTest.java
View File

@ -21,23 +21,26 @@ import junit.framework.Test;
import org.apache.activemq.transport.tcp.TransportUriTest;
public class FailoverUriTest extends TransportUriTest {
public void initCombosForTestUriOptionsWork() {
addCombinationValues("prefix", new Object[] {"failover:(", "failover://("});
addCombinationValues("prefix", new Object[]{"failover:(", "failover://("});
addCombinationValues("postfix", new Object[] {")?initialReconnectDelay=1000&maxReconnectDelay=1000"
, "?wireFormat.tightEncodingEnabled=false)?jms.useAsyncSend=true&jms.copyMessageOnSend=false"
, "?wireFormat.maxInactivityDuration=0&keepAlive=true)?jms.prefetchPolicy.all=500&initialReconnectDelay=10000&useExponentialBackOff=false&maxReconnectAttempts=0&randomize=false"});
}
public void initCombosForTestBadVersionNumberDoesNotWork() {
addCombinationValues("prefix", new Object[] {"failover:("});
addCombinationValues("postfix", new Object[] {")?initialReconnectDelay=1000&maxReconnectDelay=1000"});
addCombinationValues("prefix", new Object[]{"failover:("});
// TODO uncomment after fixing https://issues.apache.org/jira/browse/AMQ-4725
// addCombinationValues("postfix", new Object[] {")?initialReconnectDelay=1000&maxReconnectDelay=1000"});
}
public void initCombosForTestBadPropertyNameFails() {
addCombinationValues("prefix", new Object[] {"failover:("});
addCombinationValues("postfix", new Object[] {")?initialReconnectDelay=1000&maxReconnectDelay=1000"});
addCombinationValues("prefix", new Object[]{"failover:("});
// TODO uncomment after fixing https://issues.apache.org/jira/browse/AMQ-4725
//addCombinationValues("postfix", new Object[] {")?initialReconnectDelay=1000&maxReconnectDelay=1000"});
}
public static Test suite() {
return suite(FailoverUriTest.class);

193
activemq-unit-tests/src/test/java/org/apache/activemq/transport/tcp/TransportUriTest.java
View File

@ -18,7 +18,9 @@ package org.apache.activemq.transport.tcp;
import javax.jms.Connection;
import javax.jms.JMSException;
import junit.framework.Test;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.EmbeddedBrokerTestSupport;
import org.apache.activemq.broker.BrokerService;
@ -26,7 +28,7 @@ import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
/**
*
*
*/
public class TransportUriTest extends EmbeddedBrokerTestSupport {
@ -35,89 +37,88 @@ public class TransportUriTest extends EmbeddedBrokerTestSupport {
private static final String TOS = "&typeOfService=";
protected Connection connection;
public String prefix;
public String postfix;
public void initCombosForTestUriOptionsWork() {
initSharedCombos();
}
public void testUriOptionsWork() throws Exception {
String uri = prefix + bindAddress + postfix;
LOG.info("Connecting via: " + uri);
connection = new ActiveMQConnectionFactory(uri).createConnection();
connection.start();
}
public void initCombosForTestValidDiffServOptionsWork() {
initSharedCombos();
}
public void testValidDiffServOptionsWork() throws Exception {
String[] validIntegerOptions = {"0", "1", "32", "62", "63"};
for (String opt : validIntegerOptions) {
testValidOptionsWork(DIFF_SERV + opt, "");
}
String[] validNameOptions = { "CS0", "CS1", "CS2", "CS3", "CS4", "CS5", "CS6",
"CS7", "EF", "AF11", "AF12","AF13", "AF21", "AF22", "AF23", "AF31",
"AF32", "AF33", "AF41", "AF42", "AF43" };
for (String opt : validNameOptions) {
testValidOptionsWork(DIFF_SERV + opt, "");
}
}
public void initCombosForTestInvalidDiffServOptionDoesNotWork() {
initSharedCombos();
}
public void testInvalidDiffServOptionsDoesNotWork() throws Exception {
String[] invalidIntegerOptions = {"-2", "-1", "64", "65", "100", "255"};
for (String opt : invalidIntegerOptions) {
testInvalidOptionsDoNotWork(DIFF_SERV + opt, "");
}
String[] invalidNameOptions = {"hi", "", "A", "AF", "-AF21"};
for (String opt : invalidNameOptions) {
testInvalidOptionsDoNotWork(DIFF_SERV + opt, "");
}
}
public void initCombosForTestValidTypeOfServiceOptionsWork() {
initSharedCombos();
}
public void testValidTypeOfServiceOptionsWork() throws Exception {
int[] validOptions = {0, 1, 32, 100, 254, 255};
for (int opt : validOptions) {
testValidOptionsWork(TOS + opt, "");
}
}
public void initCombosForTestInvalidTypeOfServiceOptionDoesNotWork() {
initSharedCombos();
}
public void testInvalidTypeOfServiceOptionDoesNotWork() throws Exception {
int[] invalidOptions = {-2, -1, 256, 257};
for (int opt : invalidOptions) {
testInvalidOptionsDoNotWork(TOS + opt, "");
}
}
public void initCombosForTestDiffServAndTypeOfServiceMutuallyExclusive() {
initSharedCombos();
}
public void testDiffServAndTypeServiceMutuallyExclusive() {
String msg = "It should not be possible to set both Differentiated "
+ "Services and Type of Service options on the same connection "
+ "URI.";
testInvalidOptionsDoNotWork(TOS + 32 + DIFF_SERV, msg);
testInvalidOptionsDoNotWork(DIFF_SERV + 32 + TOS + 32, msg);
}
// public void initCombosForTestUriOptionsWork() {
// initSharedCombos();
// }
//
// public void testUriOptionsWork() throws Exception {
// String uri = prefix + bindAddress + postfix;
// LOG.info("Connecting via: " + uri);
//
// connection = new ActiveMQConnectionFactory(uri).createConnection();
// connection.start();
// }
//
// public void initCombosForTestValidDiffServOptionsWork() {
// initSharedCombos();
// }
//
// public void testValidDiffServOptionsWork() throws Exception {
// String[] validIntegerOptions = {"0", "1", "32", "62", "63"};
// for (String opt : validIntegerOptions) {
// testValidOptionsWork(DIFF_SERV + opt, "");
// }
// String[] validNameOptions = { "CS0", "CS1", "CS2", "CS3", "CS4", "CS5", "CS6",
// "CS7", "EF", "AF11", "AF12","AF13", "AF21", "AF22", "AF23", "AF31",
// "AF32", "AF33", "AF41", "AF42", "AF43" };
// for (String opt : validNameOptions) {
// testValidOptionsWork(DIFF_SERV + opt, "");
// }
// }
//
// public void initCombosForTestInvalidDiffServOptionDoesNotWork() {
// initSharedCombos();
// }
//
// public void testInvalidDiffServOptionsDoesNotWork() throws Exception {
// String[] invalidIntegerOptions = {"-2", "-1", "64", "65", "100", "255"};
// for (String opt : invalidIntegerOptions) {
// testInvalidOptionsDoNotWork(DIFF_SERV + opt, "");
// }
// String[] invalidNameOptions = {"hi", "", "A", "AF", "-AF21"};
// for (String opt : invalidNameOptions) {
// testInvalidOptionsDoNotWork(DIFF_SERV + opt, "");
// }
// }
//
// public void initCombosForTestValidTypeOfServiceOptionsWork() {
// initSharedCombos();
// }
//
// public void testValidTypeOfServiceOptionsWork() throws Exception {
// int[] validOptions = {0, 1, 32, 100, 254, 255};
// for (int opt : validOptions) {
// testValidOptionsWork(TOS + opt, "");
// }
// }
//
// public void initCombosForTestInvalidTypeOfServiceOptionDoesNotWork() {
// initSharedCombos();
// }
//
// public void testInvalidTypeOfServiceOptionDoesNotWork() throws Exception {
// int[] invalidOptions = {-2, -1, 256, 257};
// for (int opt : invalidOptions) {
// testInvalidOptionsDoNotWork(TOS + opt, "");
// }
// }
//
// public void initCombosForTestDiffServAndTypeOfServiceMutuallyExclusive() {
// initSharedCombos();
// }
//
// public void testDiffServAndTypeServiceMutuallyExclusive() {
// String msg = "It should not be possible to set both Differentiated "
// + "Services and Type of Service options on the same connection "
// + "URI.";
// testInvalidOptionsDoNotWork(TOS + 32 + DIFF_SERV, msg);
// testInvalidOptionsDoNotWork(DIFF_SERV + 32 + TOS + 32, msg);
// }
//
public void initCombosForTestBadVersionNumberDoesNotWork() {
initSharedCombos();
}
@ -129,7 +130,7 @@ public class TransportUriTest extends EmbeddedBrokerTestSupport {
public void initCombosForTestBadPropertyNameFails() {
initSharedCombos();
}
public void testBadPropertyNameFails() throws Exception {
testInvalidOptionsDoNotWork("&cheese=abc", "");
}
@ -143,19 +144,19 @@ public class TransportUriTest extends EmbeddedBrokerTestSupport {
{"?tcpNoDelay=true&keepAlive=true&soLinger=-1"});
}
private void testValidOptionsWork(String options, String msg) {
String uri = prefix + bindAddress + postfix + options;
LOG.info("Connecting via: " + uri);
try {
connection = new ActiveMQConnectionFactory(uri).createConnection();
connection.start();
} catch (Exception unexpected) {
fail("Valid options '" + options + "' on URI '" + uri + "' should "
+ "not have caused an exception to be thrown. " + msg
+ " Exception: " + unexpected);
}
}
// private void testValidOptionsWork(String options, String msg) {
// String uri = prefix + bindAddress + postfix + options;
// LOG.info("Connecting via: " + uri);
//
// try {
// connection = new ActiveMQConnectionFactory(uri).createConnection();
// connection.start();
// } catch (Exception unexpected) {
// fail("Valid options '" + options + "' on URI '" + uri + "' should "
// + "not have caused an exception to be thrown. " + msg
// + " Exception: " + unexpected);
// }
// }
private void testInvalidOptionsDoNotWork(String options, String msg) {
String uri = prefix + bindAddress + postfix + options;
@ -196,7 +197,7 @@ public class TransportUriTest extends EmbeddedBrokerTestSupport {
answer.addConnector(bindAddress);
return answer;
}
public static Test suite() {
return suite(TransportUriTest.class);
}