You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@synapse.apache.org by ve...@apache.org on 2008/08/02 20:22:41 UTC

svn commit: r682033 - in /synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport: jms/ testkit/listener/

Author: veithen
Date: Sat Aug  2 11:22:40 2008
New Revision: 682033

URL: http://svn.apache.org/viewvc?rev=682033&view=rev
Log:
Changed JMS unit tests to use Qpid as JMS provider instead of Mockrunner.

Added:
    synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/MockJMSTestSetup.java
    synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/QpidTestSetup.java
Modified:
    synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSChannel.java
    synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSListenerSetup.java
    synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSListenerTest.java
    synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSRequestResponseChannel.java
    synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AbstractChannel.java
    synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AxisMessageSender.java
    synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/Channel.java
    synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/ListenerTestServer.java
    synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/ListenerTestSetup.java

Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSChannel.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSChannel.java?rev=682033&r1=682032&r2=682033&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSChannel.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSChannel.java Sat Aug  2 11:22:40 2008
@@ -19,6 +19,7 @@
 
 package org.apache.synapse.transport.jms;
 
+import javax.jms.Destination;
 import javax.jms.JMSException;
 import javax.jms.Message;
 import javax.jms.QueueConnection;
@@ -42,14 +43,12 @@
 import org.apache.synapse.transport.testkit.listener.AbstractChannel;
 import org.mockejb.jndi.MockContextFactory;
 
-import com.mockrunner.mock.jms.MockDestination;
-
 public abstract class JMSChannel extends AbstractChannel<JMSListenerSetup> {
     private static final OMFactory factory = OMAbstractFactory.getOMFactory();
     
     private final String destinationType;
     private String destinationName;
-    private MockDestination destination;
+    private Destination destination;
     
     public JMSChannel(JMSListenerSetup setup, String name, String destinationType) {
         super(name, setup);
@@ -58,7 +57,7 @@
     
     @Override
     public void setUp() throws Exception {
-        destinationName = "request";
+        destinationName = "request" + destinationType;
         destination = setup.createDestination(destinationType, destinationName);
         setup.getContext().bind(destinationName, destination);
     }

Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSListenerSetup.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSListenerSetup.java?rev=682033&r1=682032&r2=682033&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSListenerSetup.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSListenerSetup.java Sat Aug  2 11:22:40 2008
@@ -19,7 +19,10 @@
 
 package org.apache.synapse.transport.jms;
 
+import javax.jms.Destination;
+import javax.jms.Queue;
 import javax.jms.QueueConnectionFactory;
+import javax.jms.Topic;
 import javax.jms.TopicConnectionFactory;
 import javax.naming.Context;
 import javax.naming.InitialContext;
@@ -28,33 +31,27 @@
 import org.apache.synapse.transport.testkit.listener.ListenerTestSetup;
 import org.mockejb.jndi.MockContextFactory;
 
-import com.mockrunner.jms.ConfigurationManager;
-import com.mockrunner.jms.DestinationManager;
-import com.mockrunner.mock.jms.MockDestination;
-import com.mockrunner.mock.jms.MockQueueConnectionFactory;
-import com.mockrunner.mock.jms.MockTopicConnectionFactory;
-
-public class JMSListenerSetup extends ListenerTestSetup {
+public abstract class JMSListenerSetup extends ListenerTestSetup {
     public static final String QUEUE_CONNECTION_FACTORY = "QueueConnectionFactory";
     public static final String TOPIC_CONNECTION_FACTORY = "TopicConnectionFactory";
     
     private Context context;
-    private DestinationManager destinationManager;
     private QueueConnectionFactory queueConnectionFactory;
     private TopicConnectionFactory topicConnectionFactory;
     
     @Override
-    public void beforeStartup() throws Exception {
+    public void setUp() throws Exception {
         MockContextFactory.setAsInitial();
         context = new InitialContext();
-        destinationManager = new DestinationManager();
-        ConfigurationManager configurationManager = new ConfigurationManager();
-        topicConnectionFactory = new MockTopicConnectionFactory(destinationManager, configurationManager);
-        queueConnectionFactory = new MockQueueConnectionFactory(destinationManager, configurationManager);
+        queueConnectionFactory = createQueueConnectionFactory();
+        topicConnectionFactory = createTopicConnectionFactory();
         context.bind(QUEUE_CONNECTION_FACTORY, queueConnectionFactory);
         context.bind(TOPIC_CONNECTION_FACTORY, topicConnectionFactory);
     }
-
+    
+    protected abstract QueueConnectionFactory createQueueConnectionFactory() throws Exception;
+    protected abstract TopicConnectionFactory createTopicConnectionFactory() throws Exception;
+    
     @Override
     public void setupContentType(AxisService service, String contentType) throws Exception {
         service.addParameter("transport.jms.contentType", contentType);
@@ -66,14 +63,17 @@
         return context;
     }
 
-    public MockDestination createDestination(String destinationType, String name) {
+    public Destination createDestination(String destinationType, String name) {
         if (destinationType.equals(JMSConstants.DESTINATION_TYPE_TOPIC)) {
-            return destinationManager.createTopic(name);
+            return createTopic(name);
         } else {
-            return destinationManager.createQueue(name);
+            return createQueue(name);
         }
     }
 
+    public abstract Queue createQueue(String name);
+    public abstract Topic createTopic(String name);
+    
     public QueueConnectionFactory getQueueConnectionFactory() {
         return queueConnectionFactory;
     }

Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSListenerTest.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSListenerTest.java?rev=682033&r1=682032&r2=682033&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSListenerTest.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSListenerTest.java Sat Aug  2 11:22:40 2008
@@ -27,6 +27,7 @@
 
 import org.apache.axis2.context.MessageContext;
 import org.apache.synapse.transport.testkit.listener.AxisAsyncMessageSender;
+import org.apache.synapse.transport.testkit.listener.AxisRequestResponseMessageSender;
 import org.apache.synapse.transport.testkit.listener.ContentTypeMode;
 import org.apache.synapse.transport.testkit.listener.ListenerTestSuite;
 import org.apache.synapse.transport.testkit.listener.MessageTestData;
@@ -35,14 +36,14 @@
 public class JMSListenerTest extends TestCase {
     public static TestSuite suite() {
         ListenerTestSuite suite = new ListenerTestSuite();
-        JMSListenerSetup setup = new JMSListenerSetup();
+        JMSListenerSetup setup = new QpidTestSetup();
         JMSBytesMessageSender bytesMessageSender = new JMSBytesMessageSender();
         JMSTextMessageSender textMessageSender = new JMSTextMessageSender();
         List<XMLAsyncMessageSender<? super JMSAsyncChannel>> senders = new LinkedList<XMLAsyncMessageSender<? super JMSAsyncChannel>>();
         senders.add(bytesMessageSender);
         senders.add(textMessageSender);
         senders.add(new AxisAsyncMessageSender());
-//        suite.addPOXTests(new JMSRequestResponseChannel(setup, JMSConstants.DESTINATION_TYPE_QUEUE, JMSConstants.DESTINATION_TYPE_QUEUE), new AxisRequestResponseMessageSender(), ContentTypeMode.TRANSPORT);
+        suite.addPOXTests(new JMSRequestResponseChannel(setup, JMSConstants.DESTINATION_TYPE_QUEUE, JMSConstants.DESTINATION_TYPE_QUEUE), new AxisRequestResponseMessageSender(), ContentTypeMode.TRANSPORT);
         for (String destinationType : new String[] { JMSConstants.DESTINATION_TYPE_QUEUE, JMSConstants.DESTINATION_TYPE_TOPIC }) {
             JMSAsyncChannel channel = new JMSAsyncChannel(setup, destinationType);
             for (ContentTypeMode contentTypeMode : ContentTypeMode.values()) {

Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSRequestResponseChannel.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSRequestResponseChannel.java?rev=682033&r1=682032&r2=682033&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSRequestResponseChannel.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/JMSRequestResponseChannel.java Sat Aug  2 11:22:40 2008
@@ -19,15 +19,17 @@
 
 package org.apache.synapse.transport.jms;
 
+import javax.jms.Destination;
+
+import org.apache.axis2.addressing.EndpointReference;
+import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.description.AxisService;
 import org.apache.synapse.transport.testkit.listener.RequestResponseChannel;
 
-import com.mockrunner.mock.jms.MockDestination;
-
 public class JMSRequestResponseChannel extends JMSChannel implements RequestResponseChannel<JMSListenerSetup> {
     private final String replyDestinationType;
     private String replyDestinationName;
-    private MockDestination replyDestination;
+    private Destination replyDestination;
     
     public JMSRequestResponseChannel(JMSListenerSetup setup, String destinationType, String replyDestinationType) {
         super(setup, destinationType + "-" + replyDestinationType, destinationType);
@@ -37,7 +39,7 @@
     @Override
     public void setUp() throws Exception {
         super.setUp();
-        replyDestinationName = "response";
+        replyDestinationName = "response" + replyDestinationType;
         replyDestination = setup.createDestination(replyDestinationType, replyDestinationName);
         setup.getContext().bind(replyDestinationName, replyDestination);
     }
@@ -56,4 +58,15 @@
         service.addParameter(JMSConstants.REPLY_PARAM_TYPE, replyDestinationType);
         service.addParameter(JMSConstants.REPLY_PARAM, replyDestinationName);
     }
+
+    @Override
+    public void setupRequestMessageContext(MessageContext msgContext) {
+        super.setupRequestMessageContext(msgContext);
+//        msgContext.setProperty(JMSConstants.JMS_REPLY_TO, replyDestinationName);
+    }
+
+    @Override
+    public EndpointReference createEndpointReference(String address) {
+        return new EndpointReference(address + "&" + JMSConstants.REPLY_PARAM_TYPE + "=" + replyDestinationType + "&" + JMSConstants.REPLY_PARAM + "=" + replyDestinationName);
+    }
 }

Added: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/MockJMSTestSetup.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/MockJMSTestSetup.java?rev=682033&view=auto
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/MockJMSTestSetup.java (added)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/MockJMSTestSetup.java Sat Aug  2 11:22:40 2008
@@ -0,0 +1,62 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *   * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.synapse.transport.jms;
+
+import javax.jms.Queue;
+import javax.jms.QueueConnectionFactory;
+import javax.jms.Topic;
+import javax.jms.TopicConnectionFactory;
+
+import com.mockrunner.jms.ConfigurationManager;
+import com.mockrunner.jms.DestinationManager;
+import com.mockrunner.mock.jms.MockQueueConnectionFactory;
+import com.mockrunner.mock.jms.MockTopicConnectionFactory;
+
+public class MockJMSTestSetup extends JMSListenerSetup {
+    private DestinationManager destinationManager;
+    private ConfigurationManager configurationManager;
+    
+    @Override
+    public void setUp() throws Exception {
+        destinationManager = new DestinationManager();
+        configurationManager = new ConfigurationManager();
+        super.setUp();
+    }
+
+    @Override
+    protected QueueConnectionFactory createQueueConnectionFactory() throws Exception {
+        return new MockQueueConnectionFactory(destinationManager, configurationManager);
+    }
+
+    @Override
+    protected TopicConnectionFactory createTopicConnectionFactory() throws Exception {
+        return new MockTopicConnectionFactory(destinationManager, configurationManager);
+    }
+    
+    @Override
+    public Queue createQueue(String name) {
+        return destinationManager.createQueue(name);
+    }
+
+    @Override
+    public Topic createTopic(String name) {
+        return destinationManager.createTopic(name);
+    }
+}

Added: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/QpidTestSetup.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/QpidTestSetup.java?rev=682033&view=auto
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/QpidTestSetup.java (added)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/jms/QpidTestSetup.java Sat Aug  2 11:22:40 2008
@@ -0,0 +1,69 @@
+/*
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *   * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.synapse.transport.jms;
+
+import javax.jms.Queue;
+import javax.jms.QueueConnectionFactory;
+import javax.jms.Topic;
+import javax.jms.TopicConnectionFactory;
+
+import org.apache.qpid.client.AMQConnectionFactory;
+import org.apache.qpid.client.AMQQueue;
+import org.apache.qpid.client.AMQTopic;
+import org.apache.qpid.client.transport.TransportConnection;
+import org.apache.qpid.framing.AMQShortString;
+
+public class QpidTestSetup extends JMSListenerSetup {
+    @Override
+    public void setUp() throws Exception {
+        TransportConnection.createVMBroker(1);
+        super.setUp();
+    }
+
+    @Override
+    public void tearDown() throws Exception {
+        super.tearDown();
+        TransportConnection.killVMBroker(1);
+    }
+
+    @Override
+    protected QueueConnectionFactory createQueueConnectionFactory() throws Exception {
+        return createConnectionFactory();
+    }
+
+    @Override
+    protected TopicConnectionFactory createTopicConnectionFactory() throws Exception {
+        return createConnectionFactory();
+    }
+    
+    private AMQConnectionFactory createConnectionFactory() throws Exception {
+        return new AMQConnectionFactory("vm://:1", "guest", "guest", "fred", "test");
+    }
+
+    @Override
+    public Queue createQueue(String name) {
+        return new AMQQueue(name, name);
+    }
+
+    @Override
+    public Topic createTopic(String name) {
+        return new AMQTopic(new AMQShortString(name), name);
+    }
+}

Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AbstractChannel.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AbstractChannel.java?rev=682033&r1=682032&r2=682033&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AbstractChannel.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AbstractChannel.java Sat Aug  2 11:22:40 2008
@@ -19,6 +19,8 @@
 
 package org.apache.synapse.transport.testkit.listener;
 
+import org.apache.axis2.addressing.EndpointReference;
+import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.TransportOutDescription;
 
@@ -51,6 +53,13 @@
     public void setupService(AxisService service) throws Exception {
     }
     
+    public void setupRequestMessageContext(MessageContext msgContext) {
+    }
+
+    public EndpointReference createEndpointReference(String address) {
+        return new EndpointReference(address);
+    }
+
     public void setUp() throws Exception {
     }
 

Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AxisMessageSender.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AxisMessageSender.java?rev=682033&r1=682032&r2=682033&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AxisMessageSender.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/AxisMessageSender.java Sat Aug  2 11:22:40 2008
@@ -26,7 +26,6 @@
 import org.apache.axiom.om.OMElement;
 import org.apache.axis2.AxisFault;
 import org.apache.axis2.Constants;
-import org.apache.axis2.addressing.EndpointReference;
 import org.apache.axis2.client.OperationClient;
 import org.apache.axis2.client.Options;
 import org.apache.axis2.client.ServiceClient;
@@ -41,6 +40,7 @@
 public class AxisMessageSender<C extends Channel<?>> extends AbstractMessageSender<C> {
     private static final Log log = LogFactory.getLog(AxisMessageSender.class);
     
+    private C channel;
     private TransportOutDescription trpOutDesc;
     private ConfigurationContext cfgCtx;
     
@@ -51,6 +51,8 @@
     @Override
     public void setUp(C channel) throws Exception {
         super.setUp(channel);
+        this.channel = channel;
+        
         cfgCtx =
             ConfigurationContextFactory.createConfigurationContextFromFileSystem(
                     new File("target/test_rep").getAbsolutePath());
@@ -71,13 +73,14 @@
         log.info("Sending to " + endpointReference);
         
         Options options = new Options();
-        options.setTo(new EndpointReference(endpointReference));
+        options.setTo(channel.createEndpointReference(endpointReference));
 
         ServiceClient serviceClient = new ServiceClient(cfgCtx, null);
         serviceClient.setOptions(options);
         
         OperationClient mepClient = serviceClient.createClient(operationQName);
         MessageContext mc = xmlMessageType.createMessageContext(payload);
+        channel.setupRequestMessageContext(mc);
         mc.setProperty(Constants.Configuration.CHARACTER_SET_ENCODING, charset);
         mc.setServiceContext(serviceClient.getServiceContext());
         mepClient.addMessageContext(mc);

Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/Channel.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/Channel.java?rev=682033&r1=682032&r2=682033&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/Channel.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/Channel.java Sat Aug  2 11:22:40 2008
@@ -19,6 +19,8 @@
 
 package org.apache.synapse.transport.testkit.listener;
 
+import org.apache.axis2.addressing.EndpointReference;
+import org.apache.axis2.context.MessageContext;
 import org.apache.axis2.description.AxisService;
 import org.apache.axis2.description.Parameter;
 import org.apache.axis2.description.TransportInDescription;
@@ -50,6 +52,10 @@
      */
     void setupService(AxisService service) throws Exception;
     
+    void setupRequestMessageContext(MessageContext msgContext);
+    
+    EndpointReference createEndpointReference(String address);
+    
     void setUp() throws Exception;
     void tearDown() throws Exception;
 }

Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/ListenerTestServer.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/ListenerTestServer.java?rev=682033&r1=682032&r2=682033&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/ListenerTestServer.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/ListenerTestServer.java Sat Aug  2 11:22:40 2008
@@ -60,7 +60,7 @@
         }
         activeServer = this;
         
-        channel.getSetup().beforeStartup();
+        channel.getSetup().setUp();
         
         TransportOutDescription trpOutDesc;
         if (channel instanceof RequestResponseChannel) {
@@ -96,6 +96,7 @@
     public void stop() throws Exception {
         super.stop();
         channel.tearDown();
+        channel.getSetup().tearDown();
         Thread.sleep(100); // TODO: this is required for the NIO transport; check whether this is a bug
         activeServer = null;
     }

Modified: synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/ListenerTestSetup.java
URL: http://svn.apache.org/viewvc/synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/ListenerTestSetup.java?rev=682033&r1=682032&r2=682033&view=diff
==============================================================================
--- synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/ListenerTestSetup.java (original)
+++ synapse/trunk/java/modules/transports/src/test/java/org/apache/synapse/transport/testkit/listener/ListenerTestSetup.java Sat Aug  2 11:22:40 2008
@@ -41,7 +41,10 @@
      * 
      * @throws Exception
      */
-    public void beforeStartup() throws Exception {
+    public void setUp() throws Exception {
+    }
+    
+    public void tearDown() throws Exception {
     }
     
     /**