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 

Enable all tests now that things are fixed.
This commit is contained in:
Timothy Bish 2013-09-18 10:27:26 -04:00
parent 5215fc21d6
commit e6e7ba7e44
2 changed files with 108 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -22,6 +22,7 @@ import org.apache.activemq.transport.tcp.TransportUriTest;
public class FailoverUriTest extends TransportUriTest { public class FailoverUriTest extends TransportUriTest {
@Override
public void initCombosForTestUriOptionsWork() { public void initCombosForTestUriOptionsWork() {
addCombinationValues("prefix", new Object[]{"failover:(", "failover://("}); addCombinationValues("prefix", new Object[]{"failover:(", "failover://("});
addCombinationValues("postfix", new Object[] {")?initialReconnectDelay=1000&maxReconnectDelay=1000" addCombinationValues("postfix", new Object[] {")?initialReconnectDelay=1000&maxReconnectDelay=1000"
@ -29,19 +30,18 @@ public class FailoverUriTest extends TransportUriTest {
, "?wireFormat.maxInactivityDuration=0&keepAlive=true)?jms.prefetchPolicy.all=500&initialReconnectDelay=10000&useExponentialBackOff=false&maxReconnectAttempts=0&randomize=false"}); , "?wireFormat.maxInactivityDuration=0&keepAlive=true)?jms.prefetchPolicy.all=500&initialReconnectDelay=10000&useExponentialBackOff=false&maxReconnectAttempts=0&randomize=false"});
} }
@Override
public void initCombosForTestBadVersionNumberDoesNotWork() { public void initCombosForTestBadVersionNumberDoesNotWork() {
addCombinationValues("prefix", new Object[]{"failover:("}); 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"});
// addCombinationValues("postfix", new Object[] {")?initialReconnectDelay=1000&maxReconnectDelay=1000"});
} }
@Override
public void initCombosForTestBadPropertyNameFails() { public void initCombosForTestBadPropertyNameFails() {
addCombinationValues("prefix", new Object[]{"failover:("}); 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"});
//addCombinationValues("postfix", new Object[] {")?initialReconnectDelay=1000&maxReconnectDelay=1000"});
} }
public static Test suite() { public static Test suite() {
return suite(FailoverUriTest.class); return suite(FailoverUriTest.class);
} }

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

@ -41,84 +41,84 @@ public class TransportUriTest extends EmbeddedBrokerTestSupport {
public String prefix; public String prefix;
public String postfix; public String postfix;
// public void initCombosForTestUriOptionsWork() { public void initCombosForTestUriOptionsWork() {
// initSharedCombos(); initSharedCombos();
// } }
//
// public void testUriOptionsWork() throws Exception { public void testUriOptionsWork() throws Exception {
// String uri = prefix + bindAddress + postfix; String uri = prefix + bindAddress + postfix;
// LOG.info("Connecting via: " + uri); LOG.info("Connecting via: " + uri);
//
// connection = new ActiveMQConnectionFactory(uri).createConnection(); connection = new ActiveMQConnectionFactory(uri).createConnection();
// connection.start(); connection.start();
// } }
//
// public void initCombosForTestValidDiffServOptionsWork() { public void initCombosForTestValidDiffServOptionsWork() {
// initSharedCombos(); initSharedCombos();
// } }
//
// public void testValidDiffServOptionsWork() throws Exception { public void testValidDiffServOptionsWork() throws Exception {
// String[] validIntegerOptions = {"0", "1", "32", "62", "63"}; String[] validIntegerOptions = {"0", "1", "32", "62", "63"};
// for (String opt : validIntegerOptions) { for (String opt : validIntegerOptions) {
// testValidOptionsWork(DIFF_SERV + opt, ""); testValidOptionsWork(DIFF_SERV + opt, "");
// } }
// String[] validNameOptions = { "CS0", "CS1", "CS2", "CS3", "CS4", "CS5", "CS6", String[] validNameOptions = { "CS0", "CS1", "CS2", "CS3", "CS4", "CS5", "CS6",
// "CS7", "EF", "AF11", "AF12","AF13", "AF21", "AF22", "AF23", "AF31", "CS7", "EF", "AF11", "AF12","AF13", "AF21", "AF22", "AF23", "AF31",
// "AF32", "AF33", "AF41", "AF42", "AF43" }; "AF32", "AF33", "AF41", "AF42", "AF43" };
// for (String opt : validNameOptions) { for (String opt : validNameOptions) {
// testValidOptionsWork(DIFF_SERV + opt, ""); testValidOptionsWork(DIFF_SERV + opt, "");
// } }
// } }
//
// public void initCombosForTestInvalidDiffServOptionDoesNotWork() { public void initCombosForTestInvalidDiffServOptionDoesNotWork() {
// initSharedCombos(); initSharedCombos();
// } }
//
// public void testInvalidDiffServOptionsDoesNotWork() throws Exception { public void testInvalidDiffServOptionsDoesNotWork() throws Exception {
// String[] invalidIntegerOptions = {"-2", "-1", "64", "65", "100", "255"}; String[] invalidIntegerOptions = {"-2", "-1", "64", "65", "100", "255"};
// for (String opt : invalidIntegerOptions) { for (String opt : invalidIntegerOptions) {
// testInvalidOptionsDoNotWork(DIFF_SERV + opt, ""); testInvalidOptionsDoNotWork(DIFF_SERV + opt, "");
// } }
// String[] invalidNameOptions = {"hi", "", "A", "AF", "-AF21"}; String[] invalidNameOptions = {"hi", "", "A", "AF", "-AF21"};
// for (String opt : invalidNameOptions) { for (String opt : invalidNameOptions) {
// testInvalidOptionsDoNotWork(DIFF_SERV + opt, ""); testInvalidOptionsDoNotWork(DIFF_SERV + opt, "");
// } }
// } }
//
// public void initCombosForTestValidTypeOfServiceOptionsWork() { public void initCombosForTestValidTypeOfServiceOptionsWork() {
// initSharedCombos(); initSharedCombos();
// } }
//
// public void testValidTypeOfServiceOptionsWork() throws Exception { public void testValidTypeOfServiceOptionsWork() throws Exception {
// int[] validOptions = {0, 1, 32, 100, 254, 255}; int[] validOptions = {0, 1, 32, 100, 254, 255};
// for (int opt : validOptions) { for (int opt : validOptions) {
// testValidOptionsWork(TOS + opt, ""); testValidOptionsWork(TOS + opt, "");
// } }
// } }
//
// public void initCombosForTestInvalidTypeOfServiceOptionDoesNotWork() { public void initCombosForTestInvalidTypeOfServiceOptionDoesNotWork() {
// initSharedCombos(); initSharedCombos();
// } }
//
// public void testInvalidTypeOfServiceOptionDoesNotWork() throws Exception { public void testInvalidTypeOfServiceOptionDoesNotWork() throws Exception {
// int[] invalidOptions = {-2, -1, 256, 257}; int[] invalidOptions = {-2, -1, 256, 257};
// for (int opt : invalidOptions) { for (int opt : invalidOptions) {
// testInvalidOptionsDoNotWork(TOS + opt, ""); testInvalidOptionsDoNotWork(TOS + opt, "");
// } }
// } }
//
// public void initCombosForTestDiffServAndTypeOfServiceMutuallyExclusive() { public void initCombosForTestDiffServAndTypeOfServiceMutuallyExclusive() {
// initSharedCombos(); initSharedCombos();
// } }
//
// public void testDiffServAndTypeServiceMutuallyExclusive() { public void testDiffServAndTypeServiceMutuallyExclusive() {
// String msg = "It should not be possible to set both Differentiated " String msg = "It should not be possible to set both Differentiated "
// + "Services and Type of Service options on the same connection " + "Services and Type of Service options on the same connection "
// + "URI."; + "URI.";
// testInvalidOptionsDoNotWork(TOS + 32 + DIFF_SERV, msg); testInvalidOptionsDoNotWork(TOS + 32 + DIFF_SERV, msg);
// testInvalidOptionsDoNotWork(DIFF_SERV + 32 + TOS + 32, msg); testInvalidOptionsDoNotWork(DIFF_SERV + 32 + TOS + 32, msg);
// } }
//
public void initCombosForTestBadVersionNumberDoesNotWork() { public void initCombosForTestBadVersionNumberDoesNotWork() {
initSharedCombos(); initSharedCombos();
} }
@ -144,19 +144,19 @@ public class TransportUriTest extends EmbeddedBrokerTestSupport {
{"?tcpNoDelay=true&keepAlive=true&soLinger=-1"}); {"?tcpNoDelay=true&keepAlive=true&soLinger=-1"});
} }
// private void testValidOptionsWork(String options, String msg) { private void testValidOptionsWork(String options, String msg) {
// String uri = prefix + bindAddress + postfix + options; String uri = prefix + bindAddress + postfix + options;
// LOG.info("Connecting via: " + uri); LOG.info("Connecting via: " + uri);
//
// try { try {
// connection = new ActiveMQConnectionFactory(uri).createConnection(); connection = new ActiveMQConnectionFactory(uri).createConnection();
// connection.start(); connection.start();
// } catch (Exception unexpected) { } catch (Exception unexpected) {
// fail("Valid options '" + options + "' on URI '" + uri + "' should " fail("Valid options '" + options + "' on URI '" + uri + "' should "
// + "not have caused an exception to be thrown. " + msg + "not have caused an exception to be thrown. " + msg
// + " Exception: " + unexpected); + " Exception: " + unexpected);
// } }
// } }
private void testInvalidOptionsDoNotWork(String options, String msg) { private void testInvalidOptionsDoNotWork(String options, String msg) {
String uri = prefix + bindAddress + postfix + options; String uri = prefix + bindAddress + postfix + options;