Author: burton
Date: Mon Mar 14 15:02:23 2005
New Revision: 157480
URL: http://svn.apache.org/viewcvs?view=rev&rev=157480
Log:
Refactored test mechanism.. all of our anchor parser unit tests works. Blogger
test fails but I think thats not release depenedent and is a blogger bug
Modified:
jakarta/commons/proper/feedparser/trunk/build.xml
jakarta/commons/proper/feedparser/trunk/src/java/org/apache/commons/feedparser/locate/ProbeLocator.java
jakarta/commons/proper/feedparser/trunk/src/java/org/apache/commons/feedparser/test/TestPerformance.java
jakarta/commons/proper/feedparser/trunk/src/java/org/apache/commons/feedparser/test/TestProbeLocator.java
Modified: jakarta/commons/proper/feedparser/trunk/build.xml
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/feedparser/trunk/build.xml?view=diff&r1=157479&r2=157480
==============================================================================
--- jakarta/commons/proper/feedparser/trunk/build.xml (original)
+++ jakarta/commons/proper/feedparser/trunk/build.xml Mon Mar 14 15:02:23 2005
@@ -112,7 +112,7 @@
</target>
<target name="test-autodiscover" description="Runs the testing class for
autodiscovery"
- depends="jar">
+ depends="jar">
<java classpathref="project.classpath"
classname="org.apache.commons.feedparser.locate.TestFeedLocator"
@@ -140,10 +140,10 @@
</target>
<target name="test" depends="jar,compile.test" description="Run junit
tests." if="junit.available">
- <junit printsummary="withOutAndErr"
+ <junit printsummary="on"
fork="true"
filtertrace="true"
- haltonfailure="true"
+ haltonfailure="false"
haltonerror="false">
<sysproperty key="feedparser.home" value="${feedparser.home}"/>
<classpath>
@@ -151,13 +151,18 @@
<pathelement location="${compile.dir}"/>
<pathelement location="${junit.dir}"/>
</classpath>
- <formatter type="plain" usefile="false"/>
- <batchtest>
+
+ <batchtest todir="target/test-reports">
<fileset dir="${src.dir}/java">
<include name="**/Test*.java"/>
<exclude name="**/Test.java" />
</fileset>
+ <fileset dir="${src.dir}/test">
+ <include name="**/Test*.java"/>
+ </fileset>
+
</batchtest>
+
</junit>
</target>
Modified:
jakarta/commons/proper/feedparser/trunk/src/java/org/apache/commons/feedparser/locate/ProbeLocator.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/feedparser/trunk/src/java/org/apache/commons/feedparser/locate/ProbeLocator.java?view=diff&r1=157479&r2=157480
==============================================================================
---
jakarta/commons/proper/feedparser/trunk/src/java/org/apache/commons/feedparser/locate/ProbeLocator.java
(original)
+++
jakarta/commons/proper/feedparser/trunk/src/java/org/apache/commons/feedparser/locate/ProbeLocator.java
Mon Mar 14 15:02:23 2005
@@ -175,8 +175,10 @@
*
* @author Brad Neuberg, [EMAIL PROTECTED]
*/
- protected static boolean feedExists(String resource, BlogService
blogService)
- throws Exception {
+ protected static boolean feedExists( String resource,
+ BlogService blogService)
+ throws Exception {
+
log.debug("feedExists, resource="+resource);
ResourceRequest request = ResourceRequestFactory.getResourceRequest(
resource );
Modified:
jakarta/commons/proper/feedparser/trunk/src/java/org/apache/commons/feedparser/test/TestPerformance.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/feedparser/trunk/src/java/org/apache/commons/feedparser/test/TestPerformance.java?view=diff&r1=157479&r2=157480
==============================================================================
---
jakarta/commons/proper/feedparser/trunk/src/java/org/apache/commons/feedparser/test/TestPerformance.java
(original)
+++
jakarta/commons/proper/feedparser/trunk/src/java/org/apache/commons/feedparser/test/TestPerformance.java
Mon Mar 14 15:02:23 2005
@@ -38,11 +38,15 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Kevin A. Burton</a>
* @version $Id$
*/
-public class TestPerformance {
+public class TestPerformance extends TestCase {
+
+ public TestPerformance( String name ) {
+ super( name );
+ }
static SAXParser parser = null;
- public static void doTestSAX() throws Exception {
+ public static void testSAX() throws Exception {
if ( parser == null ) {
parser = SAXParserFactory.newInstance().newSAXParser();
@@ -92,7 +96,7 @@
}
- public static void doTestDefault() throws Exception {
+ public static void testDefault() throws Exception {
FeedParser parser = FeedParserFactory.newFeedParser();
FeedParserListener listener = new DefaultFeedParserListener() {};
@@ -110,13 +114,13 @@
public static void main( String[] args ) throws Exception {
- TestPerformance test = new TestPerformance();
+ TestPerformance test = new TestPerformance( null );
//test.testGetWeblogLinkForResource();
//test.test1();
- doTestMethod( "doTestSAX", TestPerformance.class, 100 );
- doTestMethod( "doTestDefault", TestPerformance.class, 100 );
+ doTestMethod( "testSAX", TestPerformance.class, 100 );
+ doTestMethod( "testDefault", TestPerformance.class, 100 );
}
Modified:
jakarta/commons/proper/feedparser/trunk/src/java/org/apache/commons/feedparser/test/TestProbeLocator.java
URL:
http://svn.apache.org/viewcvs/jakarta/commons/proper/feedparser/trunk/src/java/org/apache/commons/feedparser/test/TestProbeLocator.java?view=diff&r1=157479&r2=157480
==============================================================================
---
jakarta/commons/proper/feedparser/trunk/src/java/org/apache/commons/feedparser/test/TestProbeLocator.java
(original)
+++
jakarta/commons/proper/feedparser/trunk/src/java/org/apache/commons/feedparser/test/TestProbeLocator.java
Mon Mar 14 15:02:23 2005
@@ -64,11 +64,15 @@
public void testBlogger() throws Exception {
System.out.println("\nTesting Blogger...");
- testSite("http://edpro.blogspot.com/";, new Blogger(), 1,
- new String[] { FeedReference.ATOM_MEDIA_TYPE },
- new String[] { "http://edpro.blogspot.com/atom.xml"; },
- HAS_ATOM_FEED, "http://edpro.blogspot.com/atom.xml";,
- NO_RSS_FEED, null);
+ testSite( "http://edpro.blogspot.com/";,
+ new Blogger(),
+ 1,
+ new String[] { FeedReference.ATOM_MEDIA_TYPE },
+ new String[] { "http://edpro.blogspot.com/atom.xml"; },
+ HAS_ATOM_FEED,
+ "http://edpro.blogspot.com/atom.xml";,
+ NO_RSS_FEED,
+ null );
testSite("http://carolinascl.blogspot.com/";, new Blogger(), 1,
new String[] { FeedReference.ATOM_MEDIA_TYPE },
@@ -582,12 +586,17 @@
return list;
}
- private FeedList testFeedLocator(String resource, BlogService
correctBlogService,
- int numberOfFeeds, String feedType[],
- String feedURL[], boolean hasAtomFeed,
- String atomFeedURL, boolean hasRSSFeed,
- String rssFeedURL) throws Exception {
- FeedList list = FeedLocator.locate(resource);
+ private FeedList testFeedLocator( String resource,
+ BlogService correctBlogService,
+ int numberOfFeeds,
+ String feedType[],
+ String feedURL[],
+ boolean hasAtomFeed,
+ String atomFeedURL,
+ boolean hasRSSFeed,
+ String rssFeedURL ) throws Exception {
+
+ FeedList list = FeedLocator.locate( resource );
FeedReference atomFeed = list.getAdAtomFeed();
FeedReference rssFeed = list.getAdRSSFeed();
if (hasAtomFeed) {
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
