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/18 07:09:33 UTC
svn commit: r785907 - in /camel/trunk/components/camel-rss: ./
src/test/java/org/apache/camel/component/rss/
src/test/java/org/apache/camel/dataformat/rss/
Author: ningjiang
Date: Thu Jun 18 05:09:33 2009
New Revision: 785907
URL: http://svn.apache.org/viewvc?rev=785907&view=rev
Log:
CAMEL-1712 Upgraded the camel-rss to JUnit4
Modified:
camel/trunk/components/camel-rss/pom.xml
camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssCustomAggregatorTest.java
camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerTest.java
camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithFilterTest.java
camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntrySortTest.java
camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssFilterTest.java
camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerTest.java
camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerWithFeedHeaderDisabledTest.java
camel/trunk/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssDataFormatTest.java
Modified: camel/trunk/components/camel-rss/pom.xml
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-rss/pom.xml?rev=785907&r1=785906&r2=785907&view=diff
==============================================================================
--- camel/trunk/components/camel-rss/pom.xml (original)
+++ camel/trunk/components/camel-rss/pom.xml Thu Jun 18 05:09: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>
Modified: camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssCustomAggregatorTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssCustomAggregatorTest.java?rev=785907&r1=785906&r2=785907&view=diff
==============================================================================
--- camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssCustomAggregatorTest.java (original)
+++ camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssCustomAggregatorTest.java Thu Jun 18 05:09:33 2009
@@ -25,14 +25,17 @@
import com.sun.syndication.feed.synd.SyndFeed;
-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.Before;
+import org.junit.Test;
-public class RssCustomAggregatorTest extends ContextTestSupport {
+public class RssCustomAggregatorTest extends CamelTestSupport {
+ @Test
public void testMergingListOfEntries() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
@@ -49,7 +52,8 @@
}
@Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
super.setUp();
copy("src/test/data/rss20.xml", "target/rss20.xml");
}
Modified: camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerTest.java?rev=785907&r1=785906&r2=785907&view=diff
==============================================================================
--- camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerTest.java (original)
+++ camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerTest.java Thu Jun 18 05:09:33 2009
@@ -16,12 +16,14 @@
*/
package org.apache.camel.component.rss;
-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;
-public class RssEntryPollingConsumerTest extends ContextTestSupport {
+public class RssEntryPollingConsumerTest extends CamelTestSupport {
+ @Test
public void testListOfEntriesIsSplitIntoPieces() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(10);
Modified: camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithFilterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithFilterTest.java?rev=785907&r1=785906&r2=785907&view=diff
==============================================================================
--- camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithFilterTest.java (original)
+++ camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntryPollingConsumerWithFilterTest.java Thu Jun 18 05:09:33 2009
@@ -28,14 +28,16 @@
import com.sun.syndication.feed.synd.SyndEntry;
import com.sun.syndication.feed.synd.SyndFeed;
-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.camel.util.jndi.JndiContext;
+import org.junit.Test;
-public class RssEntryPollingConsumerWithFilterTest extends ContextTestSupport {
+public class RssEntryPollingConsumerWithFilterTest extends CamelTestSupport {
+ @Test
public void testListOfEntriesIsSplitIntoPieces() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
// two entries were published after Fri, 31 Oct 2008 12:02:21 -0500
Modified: camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntrySortTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntrySortTest.java?rev=785907&r1=785906&r2=785907&view=diff
==============================================================================
--- camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntrySortTest.java (original)
+++ camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssEntrySortTest.java Thu Jun 18 05:09:33 2009
@@ -24,14 +24,16 @@
import com.sun.syndication.feed.synd.SyndFeed;
import org.apache.camel.Body;
-import org.apache.camel.ContextTestSupport;
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 RssEntrySortTest extends ContextTestSupport {
+public class RssEntrySortTest extends CamelTestSupport {
+ @Test
public void testSortedEntries() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:sorted");
mock.expectsAscending(ExpressionBuilder.beanExpression("myBean", "getPubDate"));
@@ -39,6 +41,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-rss/src/test/java/org/apache/camel/component/rss/RssFilterTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssFilterTest.java?rev=785907&r1=785906&r2=785907&view=diff
==============================================================================
--- camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssFilterTest.java (original)
+++ camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssFilterTest.java Thu Jun 18 05:09:33 2009
@@ -24,13 +24,15 @@
import com.sun.syndication.feed.synd.SyndFeed;
import org.apache.camel.Body;
-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;
-public class RssFilterTest extends ContextTestSupport {
+public class RssFilterTest extends CamelTestSupport {
+ @Test
public void testFilterOutNonCamelPosts() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(6);
Modified: camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerTest.java?rev=785907&r1=785906&r2=785907&view=diff
==============================================================================
--- camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerTest.java (original)
+++ camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerTest.java Thu Jun 18 05:09:33 2009
@@ -18,14 +18,16 @@
import com.sun.syndication.feed.synd.SyndFeed;
-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;
-public class RssPollingConsumerTest extends ContextTestSupport {
+public class RssPollingConsumerTest extends CamelTestSupport {
+ @Test
public void testGrabbingListOfEntries() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
Modified: camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerWithFeedHeaderDisabledTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerWithFeedHeaderDisabledTest.java?rev=785907&r1=785906&r2=785907&view=diff
==============================================================================
--- camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerWithFeedHeaderDisabledTest.java (original)
+++ camel/trunk/components/camel-rss/src/test/java/org/apache/camel/component/rss/RssPollingConsumerWithFeedHeaderDisabledTest.java Thu Jun 18 05:09:33 2009
@@ -16,14 +16,16 @@
*/
package org.apache.camel.component.rss;
-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.CamelTestSupport;
+import org.junit.Test;
-public class RssPollingConsumerWithFeedHeaderDisabledTest extends ContextTestSupport {
+public class RssPollingConsumerWithFeedHeaderDisabledTest extends CamelTestSupport {
+ @Test
public void testNoFeedInHeader() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:result");
mock.expectedMessageCount(1);
Modified: camel/trunk/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssDataFormatTest.java
URL: http://svn.apache.org/viewvc/camel/trunk/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssDataFormatTest.java?rev=785907&r1=785906&r2=785907&view=diff
==============================================================================
--- camel/trunk/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssDataFormatTest.java (original)
+++ camel/trunk/components/camel-rss/src/test/java/org/apache/camel/dataformat/rss/RssDataFormatTest.java Thu Jun 18 05:09:33 2009
@@ -20,18 +20,21 @@
import com.sun.syndication.feed.synd.SyndFeed;
-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.component.rss.RssEndpoint;
import org.apache.camel.component.rss.RssUtils;
+import org.apache.camel.test.junit4.CamelTestSupport;
+import org.junit.Before;
+import org.junit.Test;
-public class RssDataFormatTest extends ContextTestSupport {
+public class RssDataFormatTest extends CamelTestSupport {
private String feedXml;
private SyndFeed feed;
+ @Test
public void testMarshalling() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:marshal");
mock.expectedMessageCount(1);
@@ -39,6 +42,7 @@
mock.assertIsSatisfied();
}
+ @Test
public void testUnmarshalling() throws Exception {
MockEndpoint mock = getMockEndpoint("mock:unmarshal");
mock.expectedMessageCount(1);
@@ -48,7 +52,8 @@
}
@Override
- protected void setUp() throws Exception {
+ @Before
+ public void setUp() throws Exception {
feed = RssUtils.createFeed("file:src/test/data/rss20.xml");
feedXml = RssConverter.feedToXml(feed);
super.setUp();