You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@activemq.apache.org by ch...@apache.org on 2009/06/19 21:56:30 UTC
svn commit: r786645 - in
/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq:
apollo/test1/ apollo/test1/perf/ legacy/test1/
Author: chirino
Date: Fri Jun 19 19:56:29 2009
New Revision: 786645
URL: http://svn.apache.org/viewvc?rev=786645&view=rev
Log:
A couple more tests are now passing.. move em out of the legacy package.
Added:
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test1/JmsTestSupport.java
- copied, changed from r786636, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JmsTestSupport.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test1/perf/
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test1/perf/LoadTestBurnIn.java
- copied, changed from r786636, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/LoadTestBurnIn.java
Removed:
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JmsTestSupport.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/LoadTestBurnIn.java
Modified:
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test1/JMSMessageTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JMSConsumerTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JMSExclusiveConsumerTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JMSUsecaseTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JmsBenchmark.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JmsQueueBrowserTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/MessageGroupDelayedTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/MessageGroupTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/ProducerFlowControlSendFailTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/ProducerFlowControlTest.java
activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/RedeliveryPolicyTest.java
Modified: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test1/JMSMessageTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test1/JMSMessageTest.java?rev=786645&r1=786644&r2=786645&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test1/JMSMessageTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test1/JMSMessageTest.java Fri Jun 19 19:56:29 2009
@@ -43,7 +43,6 @@
import org.apache.activemq.apollo.broker.Broker;
import org.apache.activemq.apollo.broker.BrokerFactory;
import org.apache.activemq.command.ActiveMQDestination;
-import org.apache.activemq.legacy.test1.JmsTestSupport;
import org.apache.activemq.transport.TransportFactory;
/**
Copied: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test1/JmsTestSupport.java (from r786636, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JmsTestSupport.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test1/JmsTestSupport.java?p2=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test1/JmsTestSupport.java&p1=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JmsTestSupport.java&r1=786636&r2=786645&rev=786645&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JmsTestSupport.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test1/JmsTestSupport.java Fri Jun 19 19:56:29 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.legacy.test1;
+package org.apache.activemq.apollo.test1;
import java.io.File;
import java.io.IOException;
Copied: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test1/perf/LoadTestBurnIn.java (from r786636, activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/LoadTestBurnIn.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test1/perf/LoadTestBurnIn.java?p2=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test1/perf/LoadTestBurnIn.java&p1=activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/LoadTestBurnIn.java&r1=786636&r2=786645&rev=786645&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/LoadTestBurnIn.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/apollo/test1/perf/LoadTestBurnIn.java Fri Jun 19 19:56:29 2009
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.activemq.legacy.test1;
+package org.apache.activemq.apollo.test1.perf;
import java.io.IOException;
import java.net.URI;
@@ -37,9 +37,8 @@
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.apollo.broker.Broker;
+import org.apache.activemq.apollo.test1.JmsTestSupport;
import org.apache.activemq.command.ActiveMQDestination;
-import org.apache.activemq.legacy.broker.BrokerFactory;
-import org.apache.activemq.legacy.broker.TransportConnector;
import org.apache.activemq.transport.TransportFactory;
import org.apache.activemq.transport.TransportServer;
import org.apache.commons.logging.Log;
@@ -93,7 +92,7 @@
}
protected ConnectionFactory createConnectionFactory() throws URISyntaxException, IOException {
- TransportServer server = broker.getTransportServers().get(0);
+ TransportServer server = broker.getTransportServers().get(1);
return new ActiveMQConnectionFactory(server.getConnectURI());
}
Modified: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JMSConsumerTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JMSConsumerTest.java?rev=786645&r1=786644&r2=786645&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JMSConsumerTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JMSConsumerTest.java Fri Jun 19 19:56:29 2009
@@ -41,6 +41,7 @@
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.ActiveMQMessageConsumer;
import org.apache.activemq.ActiveMQSession;
+import org.apache.activemq.apollo.test1.JmsTestSupport;
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.commons.logging.Log;
Modified: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JMSExclusiveConsumerTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JMSExclusiveConsumerTest.java?rev=786645&r1=786644&r2=786645&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JMSExclusiveConsumerTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JMSExclusiveConsumerTest.java Fri Jun 19 19:56:29 2009
@@ -23,6 +23,8 @@
import javax.jms.Session;
import junit.framework.Test;
+
+import org.apache.activemq.apollo.test1.JmsTestSupport;
import org.apache.activemq.command.ActiveMQQueue;
/**
Modified: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JMSUsecaseTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JMSUsecaseTest.java?rev=786645&r1=786644&r2=786645&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JMSUsecaseTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JMSUsecaseTest.java Fri Jun 19 19:56:29 2009
@@ -29,6 +29,7 @@
import junit.framework.Test;
+import org.apache.activemq.apollo.test1.JmsTestSupport;
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.ActiveMQMessage;
Modified: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JmsBenchmark.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JmsBenchmark.java?rev=786645&r1=786644&r2=786645&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JmsBenchmark.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JmsBenchmark.java Fri Jun 19 19:56:29 2009
@@ -40,6 +40,7 @@
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.apollo.broker.Broker;
+import org.apache.activemq.apollo.test1.JmsTestSupport;
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.transport.TransportFactory;
@@ -85,7 +86,7 @@
}
protected ConnectionFactory createConnectionFactory() throws URISyntaxException, IOException {
- TransportServer server = broker.getTransportServers().get(0);
+ TransportServer server = broker.getTransportServers().get(1);
return new ActiveMQConnectionFactory(server.getConnectURI());
}
Modified: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JmsQueueBrowserTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JmsQueueBrowserTest.java?rev=786645&r1=786644&r2=786645&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JmsQueueBrowserTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/JmsQueueBrowserTest.java Fri Jun 19 19:56:29 2009
@@ -26,6 +26,7 @@
import javax.jms.Session;
import javax.jms.TextMessage;
+import org.apache.activemq.apollo.test1.JmsTestSupport;
import org.apache.activemq.command.ActiveMQQueue;
/**
Modified: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/MessageGroupDelayedTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/MessageGroupDelayedTest.java?rev=786645&r1=786644&r2=786645&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/MessageGroupDelayedTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/MessageGroupDelayedTest.java Fri Jun 19 19:56:29 2009
@@ -33,6 +33,7 @@
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.apollo.broker.Broker;
+import org.apache.activemq.apollo.test1.JmsTestSupport;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.transport.TransportFactory;
import org.apache.activemq.transport.TransportServer;
Modified: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/MessageGroupTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/MessageGroupTest.java?rev=786645&r1=786644&r2=786645&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/MessageGroupTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/MessageGroupTest.java Fri Jun 19 19:56:29 2009
@@ -8,6 +8,7 @@
import javax.jms.TextMessage;
import org.apache.activemq.apollo.CombinationTestSupport;
+import org.apache.activemq.apollo.test1.JmsTestSupport;
import org.apache.activemq.command.ActiveMQDestination;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.commons.logging.Log;
Modified: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/ProducerFlowControlSendFailTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/ProducerFlowControlSendFailTest.java?rev=786645&r1=786644&r2=786645&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/ProducerFlowControlSendFailTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/ProducerFlowControlSendFailTest.java Fri Jun 19 19:56:29 2009
@@ -110,7 +110,7 @@
@Override
protected ConnectionFactory createConnectionFactory() throws Exception {
- TransportServer server = broker.getTransportServers().get(0);
+ TransportServer server = broker.getTransportServers().get(1);
ActiveMQConnectionFactory connectionFactory = new ActiveMQConnectionFactory(server.getConnectURI());
connectionFactory.setExceptionListener(new ExceptionListener() {
public void onException(JMSException arg0) {
Modified: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/ProducerFlowControlTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/ProducerFlowControlTest.java?rev=786645&r1=786644&r2=786645&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/ProducerFlowControlTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/ProducerFlowControlTest.java Fri Jun 19 19:56:29 2009
@@ -33,6 +33,7 @@
import org.apache.activemq.ActiveMQConnection;
import org.apache.activemq.ActiveMQConnectionFactory;
import org.apache.activemq.apollo.broker.Broker;
+import org.apache.activemq.apollo.test1.JmsTestSupport;
import org.apache.activemq.command.ActiveMQQueue;
import org.apache.activemq.transport.TransportFactory;
import org.apache.activemq.transport.TransportServer;
@@ -289,7 +290,7 @@
}
protected ConnectionFactory createConnectionFactory() throws Exception {
- TransportServer server = broker.getTransportServers().get(0);
+ TransportServer server = broker.getTransportServers().get(1);
return new ActiveMQConnectionFactory(server.getConnectURI());
}
}
Modified: activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/RedeliveryPolicyTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/RedeliveryPolicyTest.java?rev=786645&r1=786644&r2=786645&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/RedeliveryPolicyTest.java (original)
+++ activemq/sandbox/activemq-flow/activemq-client/src/test/java/org/apache/activemq/legacy/test1/RedeliveryPolicyTest.java Fri Jun 19 19:56:29 2009
@@ -24,6 +24,7 @@
import junit.framework.Test;
import org.apache.activemq.RedeliveryPolicy;
+import org.apache.activemq.apollo.test1.JmsTestSupport;
import org.apache.activemq.command.ActiveMQQueue;
/**