Author: snoopdave
Date: Sun Apr 20 20:09:35 2014
New Revision: 1588834
URL: http://svn.apache.org/r1588834
Log:
Fix to make planet tests pass regardless of old data in
~/roller_data/planet_cache
Modified:
roller/branches/rome2/app/src/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java
roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/util/LinkbackExtractorTest.java
roller/branches/rome2/app/src/test/resources/roller-custom.properties
Modified:
roller/branches/rome2/app/src/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java
URL:
http://svn.apache.org/viewvc/roller/branches/rome2/app/src/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java?rev=1588834&r1=1588833&r2=1588834&view=diff
==============================================================================
---
roller/branches/rome2/app/src/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java
(original)
+++
roller/branches/rome2/app/src/test/java/org/apache/roller/planet/business/RomeFeedFetcherTest.java
Sun Apr 20 20:09:35 2014
@@ -16,11 +16,14 @@
package org.apache.roller.planet.business;
+import java.util.logging.Level;
+import java.util.logging.Logger;
import junit.framework.TestCase;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.TestUtils;
import org.apache.roller.planet.business.fetcher.FeedFetcher;
+import org.apache.roller.planet.business.fetcher.FetcherException;
import org.apache.roller.planet.pojos.Subscription;
import org.apache.roller.weblogger.business.WebloggerFactory;
@@ -45,37 +48,47 @@ public class RomeFeedFetcherTest extends
}
- public void testFetchFeed() throws Exception {
-
- FeedFetcher feedFetcher =
WebloggerFactory.getWeblogger().getFeedFetcher();
-
- // fetch feed
- Subscription sub = feedFetcher.fetchSubscription(feed_url);
- assertNotNull(sub);
- assertEquals(feed_url, sub.getFeedURL());
- assertEquals("http://rollerweblogger.org/roller/";, sub.getSiteURL());
- assertEquals("Blogging Roller", sub.getTitle());
- assertNotNull(sub.getLastUpdated());
- assertTrue(sub.getEntries().size() > 0);
+ public void testFetchFeed() throws FetcherException {
+ try {
+ FeedFetcher feedFetcher =
WebloggerFactory.getWeblogger().getFeedFetcher();
+
+ // fetch feed
+ Subscription sub = feedFetcher.fetchSubscription(feed_url);
+ assertNotNull(sub);
+ assertEquals(feed_url, sub.getFeedURL());
+ assertEquals("http://rollerweblogger.org/roller/";,
sub.getSiteURL());
+ assertEquals("Blogging Roller", sub.getTitle());
+ assertNotNull(sub.getLastUpdated());
+ assertTrue(sub.getEntries().size() > 0);
+
+ } catch (FetcherException ex) {
+ log.error("Error fetching feed", ex);
+ throw ex;
+ }
}
- public void testFetchFeedConditionally() throws Exception {
-
- FeedFetcher feedFetcher =
WebloggerFactory.getWeblogger().getFeedFetcher();
-
- // fetch feed
- Subscription sub = feedFetcher.fetchSubscription(feed_url);
- assertNotNull(sub);
- assertEquals(feed_url, sub.getFeedURL());
- assertEquals("http://rollerweblogger.org/roller/";, sub.getSiteURL());
- assertEquals("Blogging Roller", sub.getTitle());
- assertNotNull(sub.getLastUpdated());
- assertTrue(sub.getEntries().size() > 0);
-
- // now do a conditional fetch and we should get back null
- Subscription updatedSub = feedFetcher.fetchSubscription(feed_url,
sub.getLastUpdated());
- assertNull(updatedSub);
+ public void testFetchFeedConditionally() throws FetcherException {
+ try {
+ FeedFetcher feedFetcher =
WebloggerFactory.getWeblogger().getFeedFetcher();
+
+ // fetch feed
+ Subscription sub = feedFetcher.fetchSubscription(feed_url);
+ assertNotNull(sub);
+ assertEquals(feed_url, sub.getFeedURL());
+ assertEquals("http://rollerweblogger.org/roller/";,
sub.getSiteURL());
+ assertEquals("Blogging Roller", sub.getTitle());
+ assertNotNull(sub.getLastUpdated());
+ assertTrue(sub.getEntries().size() > 0);
+
+ // now do a conditional fetch and we should get back null
+ Subscription updatedSub = feedFetcher.fetchSubscription(feed_url,
sub.getLastUpdated());
+ assertNull(updatedSub);
+
+ } catch (FetcherException ex) {
+ log.error("Error fetching feed", ex);
+ throw ex;
+ }
}
}
Modified:
roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/util/LinkbackExtractorTest.java
URL:
http://svn.apache.org/viewvc/roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/util/LinkbackExtractorTest.java?rev=1588834&r1=1588833&r2=1588834&view=diff
==============================================================================
---
roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/util/LinkbackExtractorTest.java
(original)
+++
roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/util/LinkbackExtractorTest.java
Sun Apr 20 20:09:35 2014
@@ -68,6 +68,7 @@ public class LinkbackExtractorTest exten
LinkbackExtractor le = new
LinkbackExtractor(testrefs[0][0],testrefs[0][1]);
assertEquals("The Apache Cassandra Project", le.getTitle());
+
le = new LinkbackExtractor(testrefs[1][0],testrefs[1][1]);
assertEquals("Apache Roller Mobile Platform", le.getTitle());
Modified: roller/branches/rome2/app/src/test/resources/roller-custom.properties
URL:
http://svn.apache.org/viewvc/roller/branches/rome2/app/src/test/resources/roller-custom.properties?rev=1588834&r1=1588833&r2=1588834&view=diff
==============================================================================
--- roller/branches/rome2/app/src/test/resources/roller-custom.properties
(original)
+++ roller/branches/rome2/app/src/test/resources/roller-custom.properties Sun
Apr 20 20:09:35 2014
@@ -30,6 +30,7 @@ themes.dir=${testThemesDir}
search.index.dir=${testIndexDir}
uploads.dir=${testUploadsDir}
mediafiles.storage.dir=${testMediaDir}
+cache.dir=${project.build.directory}/planet-cache
# don't auto migrate during tests
uploads.migrate.auto=false
