activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chir...@apache.org
Subject svn commit: r783767 - in /activemq/sandbox/activemq-flow: activemq-all/src/test/resources/openwire-control/ activemq-broker/src/test/java/org/apache/activemq/broker/ activemq-openwire/src/test/java/org/apache/activemq/broker/ activemq-openwire/src/test...
Date Thu, 11 Jun 2009 13:49:45 GMT
Author: chirino
Date: Thu Jun 11 13:49:44 2009
New Revision: 783767

URL: http://svn.apache.org/viewvc?rev=783767&view=rev
Log:
moved the openwire perf tests under a perf package and added some testing resources needed
to get the tests passing.

Added:
    activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/perf/
    activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/
    activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/SharedQueuePerfTest.java
      - copied, changed from r783625, activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/broker/SharedQueuePerfTest.java
    activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/openwire/
      - copied from r783625, activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/broker/openwire/
    activemq/sandbox/activemq-flow/activemq-openwire/src/test/resources/openwire-control/
      - copied from r783742, activemq/sandbox/activemq-flow/activemq-all/src/test/resources/openwire-control/
Removed:
    activemq/sandbox/activemq-flow/activemq-all/src/test/resources/openwire-control/
    activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/broker/SharedQueuePerfTest.java
    activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/broker/openwire/
    activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/test/
Modified:
    activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/broker/SharedQueueTest.java
    activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/openwire/OpenwireBrokerTest.java
    activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/openwire/OpenwireRemoteConsumer.java
    activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/openwire/OpenwireRemoteProducer.java
    activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/openwire/OpenwireSupport.java

Modified: activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/broker/SharedQueueTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/broker/SharedQueueTest.java?rev=783767&r1=783766&r2=783767&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/broker/SharedQueueTest.java
(original)
+++ activemq/sandbox/activemq-flow/activemq-broker/src/test/java/org/apache/activemq/broker/SharedQueueTest.java
Thu Jun 11 13:49:44 2009
@@ -19,6 +19,8 @@
 import java.io.File;
 import java.util.ArrayList;
 
+import junit.framework.TestCase;
+
 import org.apache.activemq.apollo.broker.BrokerDatabase;
 import org.apache.activemq.apollo.broker.BrokerQueueStore;
 import org.apache.activemq.apollo.broker.MessageBroker;
@@ -33,7 +35,7 @@
  * @author cmacnaug
  * 
  */
-public class SharedQueueTest {
+public class SharedQueueTest extends TestCase {
 
 
     IDispatcher dispatcher;
@@ -51,6 +53,16 @@
 
     protected int consumerStartDelay = 0;
 
+    @Override
+    protected void setUp() throws Exception {
+    	startServices();
+    }
+    
+    @Override
+    protected void tearDown() throws Exception {
+    	stopServices();
+    }
+    
     protected void startServices() throws Exception {
         dispatcher = createDispatcher();
         dispatcher.start();

Copied: activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/SharedQueuePerfTest.java
(from r783625, activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/broker/SharedQueuePerfTest.java)
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/SharedQueuePerfTest.java?p2=activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/SharedQueuePerfTest.java&p1=activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/broker/SharedQueuePerfTest.java&r1=783625&r2=783767&rev=783767&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/broker/SharedQueuePerfTest.java
(original)
+++ activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/SharedQueuePerfTest.java
Thu Jun 11 13:49:44 2009
@@ -14,7 +14,7 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package org.apache.activemq.broker;
+package org.apache.activemq.perf.broker;
 
 import java.io.File;
 import java.io.IOException;

Modified: activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/openwire/OpenwireBrokerTest.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/openwire/OpenwireBrokerTest.java?rev=783767&r1=783625&r2=783767&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/openwire/OpenwireBrokerTest.java
(original)
+++ activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/openwire/OpenwireBrokerTest.java
Thu Jun 11 13:49:44 2009
@@ -1,4 +1,4 @@
-package org.apache.activemq.broker.openwire;
+package org.apache.activemq.perf.broker.openwire;
 
 import org.apache.activemq.broker.BrokerTestBase;
 import org.apache.activemq.broker.RemoteConsumer;

Modified: activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/openwire/OpenwireRemoteConsumer.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/openwire/OpenwireRemoteConsumer.java?rev=783767&r1=783625&r2=783767&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/openwire/OpenwireRemoteConsumer.java
(original)
+++ activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/openwire/OpenwireRemoteConsumer.java
Thu Jun 11 13:49:44 2009
@@ -1,8 +1,8 @@
-package org.apache.activemq.broker.openwire;
+package org.apache.activemq.perf.broker.openwire;
 
-import static org.apache.activemq.broker.openwire.OpenwireSupport.createConnectionInfo;
-import static org.apache.activemq.broker.openwire.OpenwireSupport.createConsumerInfo;
-import static org.apache.activemq.broker.openwire.OpenwireSupport.createSessionInfo;
+import static org.apache.activemq.perf.broker.openwire.OpenwireSupport.createConnectionInfo;
+import static org.apache.activemq.perf.broker.openwire.OpenwireSupport.createConsumerInfo;
+import static org.apache.activemq.perf.broker.openwire.OpenwireSupport.createSessionInfo;
 
 import java.io.IOException;
 
@@ -10,6 +10,7 @@
 import org.apache.activemq.apollo.broker.MessageDelivery;
 import org.apache.activemq.apollo.broker.Router;
 import org.apache.activemq.broker.RemoteConsumer;
+import org.apache.activemq.broker.openwire.OpenWireMessageDelivery;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.command.ActiveMQTopic;

Modified: activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/openwire/OpenwireRemoteProducer.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/openwire/OpenwireRemoteProducer.java?rev=783767&r1=783625&r2=783767&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/openwire/OpenwireRemoteProducer.java
(original)
+++ activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/openwire/OpenwireRemoteProducer.java
Thu Jun 11 13:49:44 2009
@@ -1,9 +1,9 @@
-package org.apache.activemq.broker.openwire;
+package org.apache.activemq.perf.broker.openwire;
 
-import static org.apache.activemq.broker.openwire.OpenwireSupport.createConnectionInfo;
-import static org.apache.activemq.broker.openwire.OpenwireSupport.createMessage;
-import static org.apache.activemq.broker.openwire.OpenwireSupport.createProducerInfo;
-import static org.apache.activemq.broker.openwire.OpenwireSupport.createSessionInfo;
+import static org.apache.activemq.perf.broker.openwire.OpenwireSupport.createConnectionInfo;
+import static org.apache.activemq.perf.broker.openwire.OpenwireSupport.createMessage;
+import static org.apache.activemq.perf.broker.openwire.OpenwireSupport.createProducerInfo;
+import static org.apache.activemq.perf.broker.openwire.OpenwireSupport.createSessionInfo;
 
 import java.io.IOException;
 
@@ -13,6 +13,7 @@
 import org.apache.activemq.apollo.broker.MessageDelivery;
 import org.apache.activemq.apollo.broker.Router;
 import org.apache.activemq.broker.RemoteProducer;
+import org.apache.activemq.broker.openwire.OpenWireMessageDelivery;
 import org.apache.activemq.command.ActiveMQDestination;
 import org.apache.activemq.command.ActiveMQQueue;
 import org.apache.activemq.command.ActiveMQTextMessage;

Modified: activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/openwire/OpenwireSupport.java
URL: http://svn.apache.org/viewvc/activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/openwire/OpenwireSupport.java?rev=783767&r1=783625&r2=783767&view=diff
==============================================================================
--- activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/openwire/OpenwireSupport.java
(original)
+++ activemq/sandbox/activemq-flow/activemq-openwire/src/test/java/org/apache/activemq/perf/broker/openwire/OpenwireSupport.java
Thu Jun 11 13:49:44 2009
@@ -1,4 +1,4 @@
-package org.apache.activemq.broker.openwire;
+package org.apache.activemq.perf.broker.openwire;
 
 import java.util.concurrent.atomic.AtomicLong;
 



Mime
View raw message