You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@camel.apache.org by ni...@apache.org on 2009/06/15 15:40:34 UTC
svn commit: r784779 - in /camel/trunk/components/camel-atom: ./
src/test/java/org/apache/camel/component/atom/
Author: ningjiang
Date: Mon Jun 15 13:40:33 2009
New Revision: 784779
URL: http://svn.apache.org/viewvc?rev=784779&view=rev
Log:
CAMEL-1712 upgrade the camel-atom JUnit version to 4.6
Modified:
camel/trunk/components/camel-atom/pom.xml
camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerTest.java
camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntrySortTest.java
camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomGoodBlogsTest.java
camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerTest.java
camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingLowDelayTest.java
camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomProducerTest.java
camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomRouteTest.java
camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/UpdatedDateFilterTest.java
Modified: camel/trunk/components/camel-atom/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-atom/pom.xml?rev=784779&r1=784778&r2=784779&view=diff
==============================================================================
--- camel/trunk/components/camel-atom/pom.xml (original)
+++ camel/trunk/components/camel-atom/pom.xml Mon Jun 15 13:40:33 2009
@@ -68,8 +68,7 @@
<!-- testing -->
<dependency>
<groupId>org.apache.camel</groupId>
- <artifactId>camel-core</artifactId>
- <type>test-jar</type>
+ <artifactId>camel-test</artifactId>
<scope>test</scope>
</dependency>
<dependency>
@@ -85,6 +84,7 @@
<dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
+ <version>4.6</version>
<scope>test</scope>
</dependency>
<!-- to allow Spring annotations (jmx) to be tested -->
Modified: camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerTest.java?rev=784779&r1=784778&r2=784779&view=diff
==============================================================================
--- camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerTest.java (original)
+++ camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntryPollingConsumerTest.java Mon Jun 15 13:40:33 2009
@@ -21,28 +21,32 @@
import javax.naming.Context;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.camel.util.jndi.JndiContext;
+import org.junit.Test;
/**
* Unit test for AtomEntryPollingConsumer
*/
-public class AtomEntryPollingConsumerTest extends ContextTestSupport {
+public class AtomEntryPollingConsumerTest extends CamelTestSupport {
+ @Test
public void testResult() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result1");
mock.expectedMessageCount(7);
mock.assertIsSatisfied();
}
+ @Test
public void testResult2() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result2");
mock.expectedMessageCount(7);
mock.assertIsSatisfied();
}
+ @Test
public void testResult3() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result3");
mock.expectedMessageCount(4);
Modified: camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntrySortTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntrySortTest.java?rev=784779&r1=784778&r2=784779&view=diff
==============================================================================
--- camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntrySortTest.java (original)
+++ camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomEntrySortTest.java Mon Jun 15 13:40:33 2009
@@ -23,16 +23,18 @@
import org.apache.abdera.model.Entry;
import org.apache.abdera.model.Feed;
import org.apache.camel.Body;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.Processor;
import org.apache.camel.builder.ExpressionBuilder;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.camel.util.jndi.JndiContext;
+import org.junit.Test;
-public class AtomEntrySortTest extends ContextTestSupport {
+public class AtomEntrySortTest extends CamelTestSupport {
+ @Test
public void testSortedEntries() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:sorted");
mock.expectsAscending(ExpressionBuilder.beanExpression("myBean", "getPubDate"));
@@ -40,6 +42,7 @@
mock.assertIsSatisfied();
}
+ @Test
public void testUnSortedEntries() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:unsorted");
mock.expectsAscending(ExpressionBuilder.beanExpression("myBean", "getPubDate"));
Modified: camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomGoodBlogsTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomGoodBlogsTest.java?rev=784779&r1=784778&r2=784779&view=diff
==============================================================================
--- camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomGoodBlogsTest.java (original)
+++ camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomGoodBlogsTest.java Mon Jun 15 13:40:33 2009
@@ -21,16 +21,20 @@
import org.apache.abdera.model.Entry;
import org.apache.camel.CamelContext;
import org.apache.camel.Exchange;
-import org.apache.camel.TestSupport;
+
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
import org.apache.camel.impl.DefaultCamelContext;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.camel.util.jndi.CamelInitialContextFactory;
+import org.junit.After;
+import org.junit.Before;
+import org.junit.Test;
/**
* Unit test with good sample for the wiki documentation
*/
-public class AtomGoodBlogsTest extends TestSupport {
+public class AtomGoodBlogsTest extends CamelTestSupport {
// START SNIPPET: e1
@@ -40,7 +44,7 @@
// We use a simple Hashtable for our bean registry. For more advanced usage Spring is supported out-of-the-box
private Hashtable beans = new Hashtable();
- // We iniitalize Camel
+ // We initialize Camel
private void setupCamel() throws Exception {
// First we register a blog service in our bean registry
beans.put("blogService", new BlogService());
@@ -87,6 +91,7 @@
* This is the actual junit test method that does the assertion that our routes is working
* as expected
*/
+ @Test
public void testFiltering() throws Exception {
// Get the mock endpoint
MockEndpoint mock = context.getEndpoint("mock:result", MockEndpoint.class);
@@ -121,12 +126,14 @@
// END SNIPPET: e1
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
super.setUp();
setupCamel();
}
- protected void tearDown() throws Exception {
+ @After
+ public void tearDown() throws Exception {
super.tearDown();
context.stop();
}
Modified: camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerTest.java?rev=784779&r1=784778&r2=784779&view=diff
==============================================================================
--- camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerTest.java (original)
+++ camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingConsumerTest.java Mon Jun 15 13:40:33 2009
@@ -19,17 +19,20 @@
import java.util.List;
import org.apache.abdera.model.Feed;
-import org.apache.camel.ContextTestSupport;
+
import org.apache.camel.Exchange;
import org.apache.camel.Message;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
/**
* Unit test for AtomPollingConsumer
*/
-public class AtomPollingConsumerTest extends ContextTestSupport {
+public class AtomPollingConsumerTest extends CamelTestSupport {
+ @Test
public void testNoSplitEntries() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
@@ -48,6 +51,7 @@
assertEquals(7, entries.size());
}
+ @Test
public void testUsingAtomUriParameter() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result2");
mock.expectedMessageCount(1);
Modified: camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingLowDelayTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingLowDelayTest.java?rev=784779&r1=784778&r2=784779&view=diff
==============================================================================
--- camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingLowDelayTest.java (original)
+++ camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomPollingLowDelayTest.java Mon Jun 15 13:40:33 2009
@@ -16,15 +16,17 @@
*/
package org.apache.camel.component.atom;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
/**
* Unit test for fast polling using a low delay
*/
-public class AtomPollingLowDelayTest extends ContextTestSupport {
+public class AtomPollingLowDelayTest extends CamelTestSupport {
+ @Test
public void testLowDelay() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(7);
Modified: camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomProducerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomProducerTest.java?rev=784779&r1=784778&r2=784779&view=diff
==============================================================================
--- camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomProducerTest.java (original)
+++ camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomProducerTest.java Mon Jun 15 13:40:33 2009
@@ -16,13 +16,16 @@
*/
package org.apache.camel.component.atom;
-import org.apache.camel.ContextTestSupport;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Test;
+
/**
* Unit test for AtomProducer.
*/
-public class AtomProducerTest extends ContextTestSupport {
+public class AtomProducerTest extends CamelTestSupport {
+ @Test
public void testNotYetImplemented() throws Exception {
try {
context.getEndpoint("atom:file://target/out.atom").createProducer();
Modified: camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomRouteTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomRouteTest.java?rev=784779&r1=784778&r2=784779&view=diff
==============================================================================
--- camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomRouteTest.java (original)
+++ camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/AtomRouteTest.java Mon Jun 15 13:40:33 2009
@@ -19,19 +19,21 @@
import java.util.List;
import org.apache.abdera.model.Entry;
-import org.apache.camel.ContextTestSupport;
import org.apache.camel.Exchange;
import org.apache.camel.builder.RouteBuilder;
import org.apache.camel.component.mock.MockEndpoint;
+import org.apache.camel.test.junit4.CamelTestSupport;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.junit.Test;
/**
* @version $Revision$
*/
-public class AtomRouteTest extends ContextTestSupport {
+public class AtomRouteTest extends CamelTestSupport {
private static final transient Log LOG = LogFactory.getLog(AtomRouteTest.class);
+ @Test
public void testFeedGetsUpdatedEvents() throws Exception {
MockEndpoint endpoint = getMockEndpoint("mock:results");
endpoint.expectedMessageCount(7);
Modified: camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/UpdatedDateFilterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/UpdatedDateFilterTest.java?rev=784779&r1=784778&r2=784779&view=diff
==============================================================================
--- camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/UpdatedDateFilterTest.java (original)
+++ camel/trunk/components/camel-atom/src/test/java/org/apache/camel/component/atom/UpdatedDateFilterTest.java Mon Jun 15 13:40:33 2009
@@ -27,12 +27,15 @@
import org.apache.abdera.model.Entry;
import org.apache.abdera.model.Feed;
import org.apache.camel.component.feed.EntryFilter;
+import org.junit.Assert;
+import org.junit.Test;
/**
* Unit test for UpdatedDateFilter
*/
-public class UpdatedDateFilterTest extends TestCase {
+public class UpdatedDateFilterTest extends Assert {
+ @Test
public void testFilter() throws Exception {
Document<Feed> doc = AtomUtils.parseDocument("file:src/test/data/feed.atom");
assertNotNull(doc);