activemq-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jstrac...@apache.org
Subject svn commit: r547211 - in /activemq/trunk/activemq-core/src: main/resources/META-INF/ test/java/org/apache/activemq/spring/ test/resources/
Date Thu, 14 Jun 2007 10:49:38 GMT
Author: jstrachan
Date: Thu Jun 14 03:49:36 2007
New Revision: 547211

URL: http://svn.apache.org/viewvc?view=rev&rev=547211
Log:
added more tests for using a remote schema using the nice new URLs

Added:
    activemq/trunk/activemq-core/src/main/resources/META-INF/spring.schemas
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/Spring2XmlNamespacesTest.java
      - copied, changed from r547196, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringTest.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/Spring2XmlNamespacesWithoutRemoteSchemaTest.java
  (with props)
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringTestSupport.java
  (with props)
    activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean-noversion.xml
      - copied, changed from r547196, activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean.xml
Modified:
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/ConsumerBean.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringConsumer.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringProducer.java
    activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringTest.java
    activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean.xml

Added: activemq/trunk/activemq-core/src/main/resources/META-INF/spring.schemas
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/main/resources/META-INF/spring.schemas?view=auto&rev=547211
==============================================================================
--- activemq/trunk/activemq-core/src/main/resources/META-INF/spring.schemas (added)
+++ activemq/trunk/activemq-core/src/main/resources/META-INF/spring.schemas Thu Jun 14 03:49:36
2007
@@ -0,0 +1,8 @@
+# resolve remote XSD documents to local classpath schema
+http\://activemq.apache.org/schema/activemq-core.xsd = activemq.xsd
+http\://activemq.apache.org/schema/activemq-core-5.0.xsd = activemq.xsd
+
+# attempt to resolve the namespace URI to a schema if no XSD is mentioned in the doc
+# TODO this is EXPERIMENTAL - it might not actually be used!
+http\://activemq.org/config/1.0=activemq.xsd
+http\://activemq.org/config/1.0/1.0.xsd=activemq.xsd
\ No newline at end of file

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/ConsumerBean.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/ConsumerBean.java?view=diff&rev=547211&r1=547210&r2=547211
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/ConsumerBean.java
(original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/ConsumerBean.java
Thu Jun 14 03:49:36 2007
@@ -17,17 +17,16 @@
  */
 package org.apache.activemq.spring;
 
+import junit.framework.Assert;
+
 import javax.jms.Message;
 import javax.jms.MessageListener;
 import java.util.ArrayList;
 import java.util.List;
 
-import junit.framework.Assert;
-
 public class ConsumerBean extends Assert implements MessageListener {
     private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory
             .getLog(ConsumerBean.class);
-
     private List messages = new ArrayList();
     private Object semaphore;
     private boolean verbose;
@@ -41,7 +40,7 @@
 
     /**
      * Constructor, initialized semaphore object.
-     * 
+     *
      * @param semaphore
      */
     public ConsumerBean(Object semaphore) {
@@ -59,7 +58,7 @@
 
     /**
      * Method implemented from MessageListener interface.
-     * 
+     *
      * @param message
      */
     public synchronized void onMessage(Message message) {
@@ -97,7 +96,7 @@
 
     /**
      * Used to wait for a message to arrive given a particular message count.
-     * 
+     *
      * @param messageCount
      */
     public void waitForMessagesToArrive(int messageCount) {
@@ -142,7 +141,7 @@
 
     /**
      * Identifies if the message is empty.
-     * 
+     *
      * @return
      */
     protected boolean hasReceivedMessage() {
@@ -151,7 +150,7 @@
 
     /**
      * Identifies if the message count has reached the total size of message.
-     * 
+     *
      * @param messageCount
      * @return
      */

Copied: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/Spring2XmlNamespacesTest.java
(from r547196, activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringTest.java)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/Spring2XmlNamespacesTest.java?view=diff&rev=547211&p1=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringTest.java&r1=547196&p2=activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/Spring2XmlNamespacesTest.java&r2=547211
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringTest.java
(original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/Spring2XmlNamespacesTest.java
Thu Jun 14 03:49:36 2007
@@ -15,193 +15,10 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.activemq.spring;
 
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.TestCase;
-
-import org.apache.activemq.broker.BrokerService;
-import org.springframework.context.support.AbstractApplicationContext;
-import org.springframework.context.support.ClassPathXmlApplicationContext;
-
-public class SpringTest extends TestCase {
-    
-    private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory
-            .getLog(SpringTest.class);
-
-    protected AbstractApplicationContext context;
-    protected SpringConsumer consumer;
-    protected SpringProducer producer;
-
-    /**
-     * Make sure that brokers are being pooled properly.
-     *
-     * @throws Exception
-     */
-    public void testSenderWithSpringXmlEmbeddedPooledBrokerConfiguredViaXml() throws Exception
{
-        String config = "spring-embedded-pooled.xml";
-        
-        Thread.currentThread().setContextClassLoader(SpringTest.class.getClassLoader());
-        ClassPathXmlApplicationContext context1 = new ClassPathXmlApplicationContext(config);
-
-        BrokerService bs1 = (BrokerService) context1.getBean("broker1");
-        assertNotNull(bs1);
-        BrokerService bs2 = (BrokerService) context1.getBean("broker2");
-        assertNotNull(bs1);
-        
-        // It should be the same broker;
-        assertEquals(bs1, bs2);
-
-        // Even if we load up another context, it should still be the same broker.
-        ClassPathXmlApplicationContext context2 = new ClassPathXmlApplicationContext(config);
-
-        BrokerService bs3 = (BrokerService) context2.getBean("broker1");
-        assertNotNull(bs3);
-        BrokerService bs4 = (BrokerService) context2.getBean("broker2");
-        assertNotNull(bs4);
-
-        // It should be the same broker;
-        assertEquals(bs1, bs3);
-        assertEquals(bs1, bs4);
-        
-        // And it should be started.
-        assertTrue(bs1.isStarted());
-        
-        // should still be started asfter the 2nd context closes.
-        context2.close();
-        assertTrue(bs1.isStarted());
-        
-        // Should stop once all contexts close.
-        context1.close();
-        assertFalse(bs1.isStarted());
-
-    }
-
-    /**
-     * Uses ActiveMQConnectionFactory to create the connection context.
-     * Configuration file is /resources/spring.xml
-     *
-     * @throws Exception
-     */
-    public void testSenderWithSpringXml() throws Exception {
-        String config = "spring.xml";
-        assertSenderConfig(config);
-    }
-
-    /**
-     * Spring configured test that uses ActiveMQConnectionFactory for
-     * connection context and ActiveMQQueue for destination. Configuration
-     * file is /resources/spring-queue.xml.
-     *
-     * @throws Exception
-     */
-    public void testSenderWithSpringXmlAndQueue() throws Exception {
-        String config = "spring-queue.xml";
-        assertSenderConfig(config);
-    }
-
-    /**
-     * Spring configured test that uses JNDI. Configuration file is
-     * /resources/spring-jndi.xml.
-     *
-     * @throws Exception
-     */
-    public void testSenderWithSpringXmlUsingJNDI() throws Exception {
-        String config = "spring-jndi.xml";
-        assertSenderConfig(config);
+public class Spring2XmlNamespacesTest extends SpringTestSupport {
+    public void testUsingSpringXmlNamespacesWithPublicXsdLocation() throws Exception {
+        assertSenderConfig("spring-embedded-xbean.xml");
     }
-    
-    /**
-     * Spring configured test where in the connection context is set to use
-     * an embedded broker. Configuration file is /resources/spring-embedded.xml
-     * and /resources/activemq.xml.
-     *
-     * @throws Exception
-     */
-    public void testSenderWithSpringXmlEmbeddedBrokerConfiguredViaXml() throws Exception
{
-        String config = "spring-embedded.xml";
-        assertSenderConfig(config);
-    }
-    
-    /**
-     * Spring configured test case that tests the remotely deployed xsd
-     * http://people.apache.org/repository/org.apache.activemq/xsds/activemq-core-4.1-SNAPSHOT.xsd
-     *  
-     * @throws Exception
-     */
-    public void testSenderWithSpringXmlUsingSpring2NamespacesWithEmbeddedBrokerConfiguredViaXml()
throws Exception {
-        String config = "spring-embedded-xbean.xml";
-        assertSenderConfig(config);
-    }
-
-    /**
-     * Spring configured test case that tests the locally generated xsd
-     *
-     * @throws Exception
-     */
-    public void testSenderWithSpringXmlUsingSpring2NamespacesWithEmbeddedBrokerConfiguredViaXmlUsingLocalXsd()
throws Exception {
-        String config = "spring-embedded-xbean-local.xml";
-        assertSenderConfig(config);
-    }
-    
-    /**
-     * assert method that is used by all the test method to send and receive messages
-     * based on each spring configuration.
-     *
-     * @param config
-     * @throws Exception
-     */
-    protected void assertSenderConfig(String config) throws Exception {
-        Thread.currentThread().setContextClassLoader(SpringTest.class.getClassLoader());
-        context = new ClassPathXmlApplicationContext(config);
-
-        consumer = (SpringConsumer) context.getBean("consumer");
-        assertTrue("Found a valid consumer", consumer != null);
-
-        consumer.start();
-        
-        // Wait a little to drain any left over messages.
-        Thread.sleep(1000);
-        consumer.flushMessages();
-
-        producer = (SpringProducer) context.getBean("producer");
-        assertTrue("Found a valid producer", producer != null);
-
-        producer.start();
-
-        // lets sleep a little to give the JMS time to dispatch stuff
-        consumer.waitForMessagesToArrive(producer.getMessageCount());
-
-        // now lets check that the consumer has received some messages
-        List messages = consumer.flushMessages();
-        log.info("Consumer has received messages....");
-        for (Iterator iter = messages.iterator(); iter.hasNext();) {
-            Object message = iter.next();
-            log.info("Received: " + message);
-        }
-
-        assertEquals("Message count", producer.getMessageCount(), messages.size());
-    }
-
-    /**
-     * Clean up method.
-     *
-     * @throws Exception
-     */
-    protected void tearDown() throws Exception {
-        if (consumer != null) {
-            consumer.stop();
-        }
-        if (producer != null) {
-            producer.stop();
-        }
-
-        if (context != null) {
-            context.destroy();
-        }
-    }
-
-}
+}
\ No newline at end of file

Added: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/Spring2XmlNamespacesWithoutRemoteSchemaTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/Spring2XmlNamespacesWithoutRemoteSchemaTest.java?view=auto&rev=547211
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/Spring2XmlNamespacesWithoutRemoteSchemaTest.java
(added)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/Spring2XmlNamespacesWithoutRemoteSchemaTest.java
Thu Jun 14 03:49:36 2007
@@ -0,0 +1,24 @@
+/**
+ *
+ * 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.activemq.spring;
+
+public class Spring2XmlNamespacesWithoutRemoteSchemaTest extends SpringTestSupport {
+    public void testUsingSpring2NamespacesForANonExistingXsdDocument() throws Exception {
+        assertSenderConfig("spring-embedded-xbean-noversion.xml");
+    }
+}
\ No newline at end of file

Propchange: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/Spring2XmlNamespacesWithoutRemoteSchemaTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringConsumer.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringConsumer.java?view=diff&rev=547211&r1=547210&r2=547211
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringConsumer.java
(original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringConsumer.java
Thu Jun 14 03:49:36 2007
@@ -15,7 +15,6 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.activemq.spring;
 
 import org.apache.commons.logging.Log;
@@ -33,7 +32,6 @@
 
 public class SpringConsumer extends ConsumerBean implements MessageListener {
     private static final Log log = LogFactory.getLog(SpringConsumer.class);
-
     private JmsTemplate template;
     private String myId = "foo";
     private Destination destination;
@@ -68,14 +66,16 @@
         }
     }
 
-
     public void stop() throws JMSException {
-		if( consumer!=null )
-			consumer.close();
-		if( session!=null )
-			session.close();
-		if( connection!=null )
-			connection.close();
+        if (consumer != null) {
+            consumer.close();
+        }
+        if (session != null) {
+            session.close();
+        }
+        if (connection != null) {
+            connection.close();
+        }
     }
 
     public void onMessage(Message message) {

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringProducer.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringProducer.java?view=diff&rev=547211&r1=547210&r2=547211
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringProducer.java
(original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringProducer.java
Thu Jun 14 03:49:36 2007
@@ -27,14 +27,11 @@
 import javax.jms.TextMessage;
 
 public class SpringProducer {
-    
     private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory
             .getLog(SpringProducer.class);
-    
     private JmsTemplate template;
     private Destination destination;
     private int messageCount = 10;
-
 
     public void start() throws JMSException {
         for (int i = 0; i < messageCount; i++) {

Modified: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringTest.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringTest.java?view=diff&rev=547211&r1=547210&r2=547211
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringTest.java
(original)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringTest.java
Thu Jun 14 03:49:36 2007
@@ -15,27 +15,12 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-
 package org.apache.activemq.spring;
 
-import java.util.Iterator;
-import java.util.List;
-
-import junit.framework.TestCase;
-
 import org.apache.activemq.broker.BrokerService;
-import org.springframework.context.support.AbstractApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
 
-public class SpringTest extends TestCase {
-    
-    private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory
-            .getLog(SpringTest.class);
-
-    protected AbstractApplicationContext context;
-    protected SpringConsumer consumer;
-    protected SpringProducer producer;
-
+public class SpringTest extends SpringTestSupport {
     /**
      * Make sure that brokers are being pooled properly.
      *
@@ -43,7 +28,7 @@
      */
     public void testSenderWithSpringXmlEmbeddedPooledBrokerConfiguredViaXml() throws Exception
{
         String config = "spring-embedded-pooled.xml";
-        
+
         Thread.currentThread().setContextClassLoader(SpringTest.class.getClassLoader());
         ClassPathXmlApplicationContext context1 = new ClassPathXmlApplicationContext(config);
 
@@ -51,7 +36,7 @@
         assertNotNull(bs1);
         BrokerService bs2 = (BrokerService) context1.getBean("broker2");
         assertNotNull(bs1);
-        
+
         // It should be the same broker;
         assertEquals(bs1, bs2);
 
@@ -66,18 +51,17 @@
         // It should be the same broker;
         assertEquals(bs1, bs3);
         assertEquals(bs1, bs4);
-        
+
         // And it should be started.
         assertTrue(bs1.isStarted());
-        
+
         // should still be started asfter the 2nd context closes.
         context2.close();
         assertTrue(bs1.isStarted());
-        
+
         // Should stop once all contexts close.
         context1.close();
         assertFalse(bs1.isStarted());
-
     }
 
     /**
@@ -113,7 +97,7 @@
         String config = "spring-jndi.xml";
         assertSenderConfig(config);
     }
-    
+
     /**
      * Spring configured test where in the connection context is set to use
      * an embedded broker. Configuration file is /resources/spring-embedded.xml
@@ -125,11 +109,11 @@
         String config = "spring-embedded.xml";
         assertSenderConfig(config);
     }
-    
+
     /**
      * Spring configured test case that tests the remotely deployed xsd
      * http://people.apache.org/repository/org.apache.activemq/xsds/activemq-core-4.1-SNAPSHOT.xsd
-     *  
+     *
      * @throws Exception
      */
     public void testSenderWithSpringXmlUsingSpring2NamespacesWithEmbeddedBrokerConfiguredViaXml()
throws Exception {
@@ -146,62 +130,4 @@
         String config = "spring-embedded-xbean-local.xml";
         assertSenderConfig(config);
     }
-    
-    /**
-     * assert method that is used by all the test method to send and receive messages
-     * based on each spring configuration.
-     *
-     * @param config
-     * @throws Exception
-     */
-    protected void assertSenderConfig(String config) throws Exception {
-        Thread.currentThread().setContextClassLoader(SpringTest.class.getClassLoader());
-        context = new ClassPathXmlApplicationContext(config);
-
-        consumer = (SpringConsumer) context.getBean("consumer");
-        assertTrue("Found a valid consumer", consumer != null);
-
-        consumer.start();
-        
-        // Wait a little to drain any left over messages.
-        Thread.sleep(1000);
-        consumer.flushMessages();
-
-        producer = (SpringProducer) context.getBean("producer");
-        assertTrue("Found a valid producer", producer != null);
-
-        producer.start();
-
-        // lets sleep a little to give the JMS time to dispatch stuff
-        consumer.waitForMessagesToArrive(producer.getMessageCount());
-
-        // now lets check that the consumer has received some messages
-        List messages = consumer.flushMessages();
-        log.info("Consumer has received messages....");
-        for (Iterator iter = messages.iterator(); iter.hasNext();) {
-            Object message = iter.next();
-            log.info("Received: " + message);
-        }
-
-        assertEquals("Message count", producer.getMessageCount(), messages.size());
-    }
-
-    /**
-     * Clean up method.
-     *
-     * @throws Exception
-     */
-    protected void tearDown() throws Exception {
-        if (consumer != null) {
-            consumer.stop();
-        }
-        if (producer != null) {
-            producer.stop();
-        }
-
-        if (context != null) {
-            context.destroy();
-        }
-    }
-
 }

Added: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringTestSupport.java
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringTestSupport.java?view=auto&rev=547211
==============================================================================
--- activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringTestSupport.java
(added)
+++ activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringTestSupport.java
Thu Jun 14 03:49:36 2007
@@ -0,0 +1,92 @@
+/**
+ *
+ * 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.activemq.spring;
+
+import junit.framework.TestCase;
+import org.springframework.context.support.AbstractApplicationContext;
+import org.springframework.context.support.ClassPathXmlApplicationContext;
+
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * @version $Revision: 1.1 $
+ */
+public class SpringTestSupport extends TestCase {
+    private static final org.apache.commons.logging.Log log = org.apache.commons.logging.LogFactory.getLog(SpringTest.class);
+    protected AbstractApplicationContext context;
+    protected SpringConsumer consumer;
+    protected SpringProducer producer;
+
+    /**
+     * assert method that is used by all the test method to send and receive messages
+     * based on each spring configuration.
+     *
+     * @param config
+     * @throws Exception
+     */
+    protected void assertSenderConfig(String config) throws Exception {
+        Thread.currentThread().setContextClassLoader(SpringTest.class.getClassLoader());
+        context = new ClassPathXmlApplicationContext(config);
+
+        consumer = (SpringConsumer) context.getBean("consumer");
+        assertTrue("Found a valid consumer", consumer != null);
+
+        consumer.start();
+
+        // Wait a little to drain any left over messages.
+        Thread.sleep(1000);
+        consumer.flushMessages();
+
+        producer = (SpringProducer) context.getBean("producer");
+        assertTrue("Found a valid producer", producer != null);
+
+        producer.start();
+
+        // lets sleep a little to give the JMS time to dispatch stuff
+        consumer.waitForMessagesToArrive(producer.getMessageCount());
+
+        // now lets check that the consumer has received some messages
+        List messages = consumer.flushMessages();
+        log.info("Consumer has received messages....");
+        for (Iterator iter = messages.iterator(); iter.hasNext();) {
+            Object message = iter.next();
+            log.info("Received: " + message);
+        }
+
+        assertEquals("Message count", producer.getMessageCount(), messages.size());
+    }
+
+    /**
+     * Clean up method.
+     *
+     * @throws Exception
+     */
+    protected void tearDown() throws Exception {
+        if (consumer != null) {
+            consumer.stop();
+        }
+        if (producer != null) {
+            producer.stop();
+        }
+
+        if (context != null) {
+            context.destroy();
+        }
+    }
+}

Propchange: activemq/trunk/activemq-core/src/test/java/org/apache/activemq/spring/SpringTestSupport.java
------------------------------------------------------------------------------
    svn:eol-style = native

Copied: activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean-noversion.xml
(from r547196, activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean.xml)
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean-noversion.xml?view=diff&rev=547211&p1=activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean.xml&r1=547196&p2=activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean-noversion.xml&r2=547211
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean.xml (original)
+++ activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean-noversion.xml Thu
Jun 14 03:49:36 2007
@@ -22,7 +22,7 @@
   xmlns:amq="http://activemq.org/config/1.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.org/config/1.0 http://people.apache.org/repository/org.apache.activemq/xsds/activemq-core-5.0-SNAPSHOT.xsd">
+  http://activemq.org/config/1.0 http://activemq.apache.org/schema/activemq-core.xsd">
   
   <!--  lets create an embedded ActiveMQ Broker -->
   <amq:broker useJmx="false" persistent="false">

Modified: activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean.xml
URL: http://svn.apache.org/viewvc/activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean.xml?view=diff&rev=547211&r1=547210&r2=547211
==============================================================================
--- activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean.xml (original)
+++ activemq/trunk/activemq-core/src/test/resources/spring-embedded-xbean.xml Thu Jun 14 03:49:36
2007
@@ -22,7 +22,7 @@
   xmlns:amq="http://activemq.org/config/1.0"
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
   xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.0.xsd
-  http://activemq.org/config/1.0 http://people.apache.org/repository/org.apache.activemq/xsds/activemq-core-5.0-SNAPSHOT.xsd">
+  http://activemq.org/config/1.0 http://activemq.apache.org/snapshot-schema/activemq-core-5.0-SNAPSHOT.xsd">
   
   <!--  lets create an embedded ActiveMQ Broker -->
   <amq:broker useJmx="false" persistent="false">



Mime
View raw message