Author: davsclaus
Date: Sun Oct 18 14:53:27 2009
New Revision: 826456
URL: http://svn.apache.org/viewvc?rev=826456&view=rev
Log:
Made unit test compatible with junit 3.8 that camel-core uses. Seeing some
strange unit tests failure locally.
Modified:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/JMXAgentTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateAlreadyExistTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateAutoRegisterTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAlreadyExistTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterBeanIdExistsTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTwoCamelContextsTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateMixedAutoRegisterTwoCamelContextsTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/MisspelledRouteRefTest.java
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringMainStartFailedIssueTest.java
Modified:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/JMXAgentTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/JMXAgentTest.java?rev=826456&r1=826455&r2=826456&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/JMXAgentTest.java
(original)
+++
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/JMXAgentTest.java
Sun Oct 18 14:53:27 2009
@@ -21,7 +21,6 @@
import javax.management.remote.JMXConnectorFactory;
import javax.management.remote.JMXServiceURL;
-import org.junit.Ignore;
import org.springframework.context.support.AbstractXmlApplicationContext;
import org.springframework.context.support.ClassPathXmlApplicationContext;
Modified:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateAlreadyExistTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateAlreadyExistTest.java?rev=826456&r1=826455&r2=826456&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateAlreadyExistTest.java
(original)
+++
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateAlreadyExistTest.java
Sun Oct 18 14:53:27 2009
@@ -18,7 +18,6 @@
import org.apache.camel.CamelContext;
import org.apache.camel.ConsumerTemplate;
-import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import
org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests;
@@ -35,7 +34,6 @@
@Autowired
private CamelContext context;
- @Test
public void testHasExistingTemplate() {
assertNotNull("Should have injected a consumer template", template);
Modified:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateAutoRegisterTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateAutoRegisterTest.java?rev=826456&r1=826455&r2=826456&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateAutoRegisterTest.java
(original)
+++
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ConsumerTemplateAutoRegisterTest.java
Sun Oct 18 14:53:27 2009
@@ -18,7 +18,6 @@
import org.apache.camel.CamelContext;
import org.apache.camel.ConsumerTemplate;
-import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import
org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests;
@@ -35,7 +34,6 @@
@Autowired
private CamelContext context;
- @Test
public void testHasTemplate() {
assertNotNull("Should have injected a consumer template", template);
Modified:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAlreadyExistTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAlreadyExistTest.java?rev=826456&r1=826455&r2=826456&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAlreadyExistTest.java
(original)
+++
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAlreadyExistTest.java
Sun Oct 18 14:53:27 2009
@@ -18,7 +18,6 @@
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
-import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import
org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests;
@@ -35,7 +34,6 @@
@Autowired
private CamelContext context;
- @Test
public void testHasExistingTemplate() {
assertNotNull("Should have injected a producer template", template);
Modified:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterBeanIdExistsTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterBeanIdExistsTest.java?rev=826456&r1=826455&r2=826456&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterBeanIdExistsTest.java
(original)
+++
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterBeanIdExistsTest.java
Sun Oct 18 14:53:27 2009
@@ -19,7 +19,6 @@
import org.apache.camel.CamelContext;
import org.apache.camel.ConsumerTemplate;
import org.apache.camel.ProducerTemplate;
-import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import
org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests;
@@ -33,13 +32,11 @@
@Autowired
private CamelContext context;
- @Test
public void testHasNoTemplate() {
Object lookup = context.getRegistry().lookup("template");
assertFalse("Should not be a producer template", lookup instanceof
ProducerTemplate);
}
- @Test
public void testHasConsumerTemplate() {
Object lookup = context.getRegistry().lookup("consumerTemplate");
assertTrue("Should be a consumer template", lookup instanceof
ConsumerTemplate);
Modified:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTest.java?rev=826456&r1=826455&r2=826456&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTest.java
(original)
+++
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTest.java
Sun Oct 18 14:53:27 2009
@@ -18,7 +18,6 @@
import org.apache.camel.CamelContext;
import org.apache.camel.ProducerTemplate;
-import org.junit.Test;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.test.context.ContextConfiguration;
import
org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests;
@@ -35,7 +34,6 @@
@Autowired
private CamelContext context;
- @Test
public void testHasTemplate() {
assertNotNull("Should have injected a producer template", template);
Modified:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTwoCamelContextsTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTwoCamelContextsTest.java?rev=826456&r1=826455&r2=826456&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTwoCamelContextsTest.java
(original)
+++
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateAutoRegisterTwoCamelContextsTest.java
Sun Oct 18 14:53:27 2009
@@ -21,7 +21,6 @@
import org.apache.camel.CamelContext;
import org.apache.camel.ConsumerTemplate;
import org.apache.camel.ProducerTemplate;
-import org.junit.Test;
import org.springframework.test.context.ContextConfiguration;
import
org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests;
@@ -37,25 +36,21 @@
@Resource(name = "camel2")
private CamelContext context2;
- @Test
public void testHasNoTemplateCamel1() {
ProducerTemplate lookup = context1.getRegistry().lookup("template",
ProducerTemplate.class);
assertNull("Should NOT lookup producer template", lookup);
}
- @Test
public void testHasNoTemplateCamel2() {
ProducerTemplate lookup = context2.getRegistry().lookup("template",
ProducerTemplate.class);
assertNull("Should NOT lookup producer template", lookup);
}
- @Test
public void testHasNoConsumerTemplateCamel1() {
ConsumerTemplate lookup =
context1.getRegistry().lookup("consumerTemplate", ConsumerTemplate.class);
assertNull("Should NOT lookup consumer template", lookup);
}
- @Test
public void testHasNoConsumerTemplateCamel2() {
ConsumerTemplate lookup =
context2.getRegistry().lookup("consumerTemplate", ConsumerTemplate.class);
assertNull("Should NOT lookup consumer template", lookup);
Modified:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateMixedAutoRegisterTwoCamelContextsTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateMixedAutoRegisterTwoCamelContextsTest.java?rev=826456&r1=826455&r2=826456&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateMixedAutoRegisterTwoCamelContextsTest.java
(original)
+++
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/config/ProducerTemplateMixedAutoRegisterTwoCamelContextsTest.java
Sun Oct 18 14:53:27 2009
@@ -20,9 +20,7 @@
import org.apache.camel.CamelContext;
import org.apache.camel.ConsumerTemplate;
-import org.apache.camel.ProducerTemplate;
import org.apache.camel.impl.DefaultProducerTemplate;
-import org.junit.Test;
import org.springframework.test.context.ContextConfiguration;
import
org.springframework.test.context.junit38.AbstractJUnit38SpringContextTests;
@@ -38,27 +36,23 @@
@Resource(name = "camel2")
private CamelContext context2;
- @Test
public void testHasTemplateCamel1() {
DefaultProducerTemplate lookup =
context1.getRegistry().lookup("template1", DefaultProducerTemplate.class);
assertNotNull("Should lookup producer template", lookup);
assertEquals("camel1", lookup.getContext().getName());
}
- @Test
public void testHasTemplateCamel2() {
DefaultProducerTemplate lookup =
context1.getRegistry().lookup("template2", DefaultProducerTemplate.class);
assertNotNull("Should lookup producer template", lookup);
assertEquals("camel2", lookup.getContext().getName());
}
- @Test
public void testHasNoConsumerTemplateCamel1() {
ConsumerTemplate lookup =
context1.getRegistry().lookup("consumerTemplate", ConsumerTemplate.class);
assertNull("Should NOT lookup consumer template", lookup);
}
- @Test
public void testHasNoConsumerTemplateCamel2() {
ConsumerTemplate lookup =
context2.getRegistry().lookup("consumerTemplate", ConsumerTemplate.class);
assertNull("Should NOT lookup consumer template", lookup);
Modified:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/MisspelledRouteRefTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/MisspelledRouteRefTest.java?rev=826456&r1=826455&r2=826456&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/MisspelledRouteRefTest.java
(original)
+++
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/MisspelledRouteRefTest.java
Sun Oct 18 14:53:27 2009
@@ -20,7 +20,6 @@
import org.apache.camel.spring.Main;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.junit.Test;
/**
* @version $Revision$
@@ -29,7 +28,6 @@
private static final transient Log LOG =
LogFactory.getLog(MisspelledRouteRefTest.class);
- @Test
public void testApplicationContextFailed() {
try {
Main main = new Main();
Modified:
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringMainStartFailedIssueTest.java
URL:
http://svn.apache.org/viewvc/camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringMainStartFailedIssueTest.java?rev=826456&r1=826455&r2=826456&view=diff
==============================================================================
---
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringMainStartFailedIssueTest.java
(original)
+++
camel/trunk/components/camel-spring/src/test/java/org/apache/camel/spring/issues/SpringMainStartFailedIssueTest.java
Sun Oct 18 14:53:27 2009
@@ -19,14 +19,12 @@
import org.apache.camel.ResolveEndpointFailedException;
import org.apache.camel.TestSupport;
import org.apache.camel.spring.Main;
-import org.junit.Test;
/**
* @version $Revision$
*/
public class SpringMainStartFailedIssueTest extends TestSupport {
- @Test
public void testStartupFailed() throws Exception {
Main main = new Main();
