diff --git a/pom.xml b/pom.xml index 0c79d56..7173ac7 100644 --- a/pom.xml +++ b/pom.xml @@ -71,6 +71,11 @@ jetty test + + ch.qos.logback + logback-classic + test + junit junit diff --git a/src/main/java/org/rometools/fetcher/impl/AbstractFeedFetcher.java b/src/main/java/org/rometools/fetcher/impl/AbstractFeedFetcher.java index 7478d86..499caf7 100644 --- a/src/main/java/org/rometools/fetcher/impl/AbstractFeedFetcher.java +++ b/src/main/java/org/rometools/fetcher/impl/AbstractFeedFetcher.java @@ -29,10 +29,15 @@ import org.rometools.fetcher.FeedFetcher; import org.rometools.fetcher.FetcherEvent; import org.rometools.fetcher.FetcherException; import org.rometools.fetcher.FetcherListener; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.sun.syndication.feed.synd.SyndFeed; public abstract class AbstractFeedFetcher implements FeedFetcher { + + private static final Logger LOG = LoggerFactory.getLogger(AbstractFeedFetcher.class); + private final Set fetcherEventListeners; private String userAgent; private boolean usingDeltaEncoding; @@ -54,11 +59,11 @@ public abstract class AbstractFeedFetcher implements FeedFetcher { System.getProperties().putAll(props); inputStream.close(); } else { - System.err.println("Could not find " + resourceName + " on classpath"); + LOG.warn("Could not find {} on classpath", resourceName); } } catch (final IOException e) { // do nothing - we don't want to fail just because we could not find the version - System.err.println("Error reading " + resourceName + " from classpath: " + e.getMessage()); + LOG.error("Error reading {} from classpath: {}", resourceName, e.getMessage()); } setUserAgent(DEFAULT_USER_AGENT + " Ver: " + System.getProperty("rome.fetcher.version", "UNKNOWN")); diff --git a/src/test/java/org/rometools/test/AbstractJettyTest.java b/src/test/java/org/rometools/test/AbstractJettyTest.java index 90e8276..03bfe6e 100644 --- a/src/test/java/org/rometools/test/AbstractJettyTest.java +++ b/src/test/java/org/rometools/test/AbstractJettyTest.java @@ -35,6 +35,8 @@ import org.rometools.fetcher.FetcherException; import org.rometools.fetcher.FetcherListener; import org.rometools.fetcher.impl.FeedFetcherCache; import org.rometools.fetcher.impl.HashMapFeedInfoCache; +import org.slf4j.Logger; +import org.slf4j.LoggerFactory; import com.sun.syndication.feed.atom.Entry; import com.sun.syndication.feed.synd.SyndEntry; @@ -45,6 +47,8 @@ import com.sun.syndication.feed.synd.SyndFeed; */ public abstract class AbstractJettyTest extends TestCase { + private static final Logger LOG = LoggerFactory.getLogger(AbstractJettyTest.class); + private HttpServer server; private final int testPort = 8283; @@ -84,6 +88,7 @@ public abstract class AbstractJettyTest extends TestCase { * @throws InterruptedException */ private void setupServer() throws InterruptedException { + // Create the server if (server != null) { server.stop(); @@ -146,13 +151,13 @@ public abstract class AbstractJettyTest extends TestCase { public void fetcherEvent(final FetcherEvent event) { final String eventType = event.getEventType(); if (FetcherEvent.EVENT_TYPE_FEED_POLLED.equals(eventType)) { - System.err.println("\tEVENT: Feed Polled. URL = " + event.getUrlString()); + LOG.debug("\tEVENT: Feed Polled. URL = " + event.getUrlString()); polled = true; } else if (FetcherEvent.EVENT_TYPE_FEED_RETRIEVED.equals(eventType)) { - System.err.println("\tEVENT: Feed Retrieved. URL = " + event.getUrlString()); + LOG.debug("\tEVENT: Feed Retrieved. URL = " + event.getUrlString()); retrieved = true; } else if (FetcherEvent.EVENT_TYPE_FEED_UNCHANGED.equals(eventType)) { - System.err.println("\tEVENT: Feed Unchanged. URL = " + event.getUrlString()); + LOG.debug("\tEVENT: Feed Unchanged. URL = " + event.getUrlString()); unchanged = true; } } @@ -215,7 +220,7 @@ public abstract class AbstractJettyTest extends TestCase { /** * Test getting a feed via a http 301 redirect - * + * */ public void testRetrieveRedirectedFeed() { final FeedFetcher feedFetcher = getFeedFetcher(); @@ -231,7 +236,7 @@ public abstract class AbstractJettyTest extends TestCase { /** * Test error handling - * + * */ public void testErrorHandling() { final FeedFetcher feedFetcher = getFeedFetcher(); @@ -260,14 +265,14 @@ public abstract class AbstractJettyTest extends TestCase { public void testUserAgent() { final FeedFetcher feedFetcher = getFeedFetcher(); - // System.out.println(feedFetcher.getUserAgent()); - // System.out.println(System.getProperty("rome.fetcher.version", "UNKNOWN")); + // LOG.debug(feedFetcher.getUserAgent()); + // LOG.debug(System.getProperty("rome.fetcher.version", "UNKNOWN")); assertEquals("Rome Client (http://tinyurl.com/64t5n) Ver: " + System.getProperty("rome.fetcher.version", "UNKNOWN"), feedFetcher.getUserAgent()); } /** * Test events fired when there is no cache in use - * + * */ public void testFetchEvents() { final FeedFetcher feedFetcher = getFeedFetcher(); @@ -297,7 +302,7 @@ public abstract class AbstractJettyTest extends TestCase { /** * Test events fired when there is a cache in use - * + * */ public void testFetchEventsWithCache() { final FeedFetcherCache feedInfoCache = new HashMapFeedInfoCache(); @@ -336,7 +341,7 @@ public abstract class AbstractJettyTest extends TestCase { /** * Test handling of GZipped feed - * + * */ public void testGZippedFeed() { final FeedFetcher feedFetcher = getFeedFetcher(); diff --git a/src/test/resources/logback-test.xml b/src/test/resources/logback-test.xml new file mode 100644 index 0000000..44dea42 --- /dev/null +++ b/src/test/resources/logback-test.xml @@ -0,0 +1,13 @@ + + + + + %d{HH:mm:ss.SSS} [%thread] %-5level %logger - %msg%n + + + + + + + + \ No newline at end of file