November 2009 - Nuiton-rss-commits - mailman.cloud.codelutin.com

r162 - trunk/src/test/java/org/nuiton/rss
by echatellier＠users.nuiton.org Nov. 26, 2009

Nov. 26, 2009

Author: echatellier Date: 2009-11-26 18:25:13 +0100 (Thu, 26 Nov 2009) New Revision: 162 Modified: trunk/src/test/java/org/nuiton/rss/RSSGeneratorHelperTest.java trunk/src/test/java/org/nuiton/rss/RSSTest.java Log: Move test to junit4 Modified: trunk/src/test/java/org/nuiton/rss/RSSGeneratorHelperTest.java =================================================================== --- trunk/src/test/java/org/nuiton/rss/RSSGeneratorHelperTest.java 2009-11-26 14:28:00 UTC (rev 161) +++ trunk/src/test/java/org/nuiton/rss/RSSGeneratorHelperTest.java 2009-11-26 17:25:13 UTC (rev 162) @@ -1,4 +1,4 @@ -/** +/* * *##% LutinRSS * Copyright (C) 2008 CodeLutin * @@ -22,27 +22,31 @@ */ package org.nuiton.rss; -import com.sun.syndication.feed.synd.SyndCategory; -import com.sun.syndication.feed.synd.SyndEntry; -import com.sun.syndication.feed.synd.SyndFeed; import java.io.File; import java.net.MalformedURLException; import java.text.ParseException; import java.util.List; import java.util.Map; +import org.junit.Assert; +import org.junit.Before; +import org.junit.Test; + +import com.sun.syndication.feed.synd.SyndCategory; +import com.sun.syndication.feed.synd.SyndEntry; +import com.sun.syndication.feed.synd.SyndFeed; + /** * * @author tony */ -public class RSSGeneratorHelperTest extends junit.framework.TestCase { +public class RSSGeneratorHelperTest { static RSSGenerator helper; static File f; - @Override - protected void setUp() throws Exception { - super.setUp(); + @Before + public void setUp() throws Exception { if (helper == null) { helper = RSSGenerator.newDefaultInstance(); } @@ -51,11 +55,7 @@ } } - @Override - protected void tearDown() throws Exception { - super.tearDown(); - } - + @Test public void testCreateFeed() throws Exception { Map<Field, Object> values = new java.util.HashMap<Field, Object>(); @@ -66,13 +66,13 @@ values.put(Field.CATEGORY, java.util.Arrays.asList("categorie1","categorie2")); values.put(Field.TIME, RSSGenerator.DATE_PARSER.format(new java.util.Date())); - assertFalse(f.exists()); + Assert.assertFalse(f.exists()); RSSGenerator.log.info("feedFile : " + f); helper.createFeedFile(f.toURI().toURL(), helper.getFormat(), values); // no lock - assertFalse(helper.getWriteFileLock(f).exists()); + Assert.assertFalse(helper.getWriteFileLock(f).exists()); // file exist - assertTrue(f.exists()); + Assert.assertTrue(f.exists()); SyndFeed feed = RSSIOUtil.readFeed(f.toURI().toURL()); @@ -80,20 +80,21 @@ RSSGenerator.log.debug(feed); } - assertEquals(feed.getFeedType(), helper.getFormat().getType()); - assertEquals(feed.getLink(), values.get(Field.LINK)); - assertEquals(feed.getTitle(), values.get(Field.NAME)); - assertEquals(feed.getDescription(), values.get(Field.DESCRIPTION)); - assertEquals(feed.getAuthor(), values.get(Field.AUTHOR)); + Assert.assertEquals(feed.getFeedType(), helper.getFormat().getType()); + Assert.assertEquals(feed.getLink(), values.get(Field.LINK)); + Assert.assertEquals(feed.getTitle(), values.get(Field.NAME)); + Assert.assertEquals(feed.getDescription(), values.get(Field.DESCRIPTION)); + Assert.assertEquals(feed.getAuthor(), values.get(Field.AUTHOR)); List<?> cats = (List<?>) values.get(Field.CATEGORY); for (Object o : feed.getCategories()) { SyndCategory cat = (SyndCategory) o; - assertTrue(cats.contains(cat.getName())); + Assert.assertTrue(cats.contains(cat.getName())); } - assertEquals(feed.getPublishedDate(), RSSGenerator.DATE_PARSER.parse((String) values.get(Field.TIME))); + Assert.assertEquals(feed.getPublishedDate(), RSSGenerator.DATE_PARSER.parse((String) values.get(Field.TIME))); } + @Test public void testCreateFeedAlreadyExisting() throws Exception { Map<Field, Object> values = new java.util.HashMap<Field, Object>(); @@ -102,22 +103,23 @@ values.put(Field.LINK, f.toURI().toURL() + ""); values.put(Field.TIME, RSSGenerator.DATE_PARSER.format(new java.util.Date())); - assertTrue(f.exists()); + Assert.assertTrue(f.exists()); try { helper.createFeedFile(f.toURI().toURL(), helper.getFormat(), values); // file already exist, can not reach this code - fail(); + Assert.fail(); } catch (IllegalStateException e) { - assertTrue(true); + Assert.assertTrue(true); } // no write lock - assertFalse(helper.getWriteFileLock(f).exists()); + Assert.assertFalse(helper.getWriteFileLock(f).exists()); } + @Test public void testAddFeedEntry() throws Exception { - assertTrue(f.exists()); + Assert.assertTrue(f.exists()); Map<Field, Object> values = createEntry(0); helper.addItemToFeedFile(f.toURI().toURL(), 2, values); @@ -125,7 +127,7 @@ SyndFeed feed = RSSIOUtil.readFeed(f.toURI().toURL()); List entries = feed.getEntries(); - assertEquals(1, entries.size()); + Assert.assertEquals(1, entries.size()); if (RSSGenerator.log.isDebugEnabled()) { RSSGenerator.log.debug(feed); @@ -136,13 +138,14 @@ assertEntry(entry, values); } + @Test public void testAddFeedEntryToMax() throws Exception { - assertTrue(f.exists()); + Assert.assertTrue(f.exists()); SyndFeed feed = RSSIOUtil.readFeed(f.toURI().toURL()); List entries = feed.getEntries(); - assertEquals(1, entries.size()); + Assert.assertEquals(1, entries.size()); SyndEntry firsEntry = (SyndEntry) entries.get(0); Map<Field, Object> values; @@ -155,7 +158,7 @@ feed = RSSIOUtil.readFeed(f.toURI().toURL()); entries = feed.getEntries(); - assertEquals(i + 1, entries.size()); + Assert.assertEquals(i + 1, entries.size()); SyndEntry entry = (SyndEntry) entries.get(i); @@ -172,7 +175,7 @@ entries = feed.getEntries(); - assertEquals(nbMaxEntries, entries.size()); + Assert.assertEquals(nbMaxEntries, entries.size()); SyndEntry entry = (SyndEntry) entries.get(nbMaxEntries - 1); @@ -180,15 +183,16 @@ // check orginal first entry is no more present entry = (SyndEntry) entries.get(0); - assertFalse(firsEntry.getTitle().equals(entry.getTitle())); + Assert.assertFalse(firsEntry.getTitle().equals(entry.getTitle())); } + @Test public void testCleanFile() throws Exception { try { - assertNotNull(f); - assertTrue(f.exists()); + Assert.assertNotNull(f); + Assert.assertTrue(f.exists()); // lock is delete - assertFalse(helper.getWriteFileLock(f).exists()); + Assert.assertFalse(helper.getWriteFileLock(f).exists()); } finally { if (f != null) { f.deleteOnExit(); @@ -197,11 +201,11 @@ } protected void assertEntry(SyndEntry entry, Map<Field, Object> values) throws ParseException { - assertEquals(entry.getLink(), values.get(Field.LINK)); - assertEquals(entry.getTitle(), values.get(Field.NAME)); - assertEquals(entry.getDescription().getValue(), values.get(Field.DESCRIPTION)); - assertEquals(entry.getAuthor(), values.get(Field.AUTHOR)); - assertEquals(entry.getPublishedDate(), RSSGenerator.DATE_PARSER.parse((String) values.get(Field.TIME))); + Assert.assertEquals(entry.getLink(), values.get(Field.LINK)); + Assert.assertEquals(entry.getTitle(), values.get(Field.NAME)); + Assert.assertEquals(entry.getDescription().getValue(), values.get(Field.DESCRIPTION)); + Assert.assertEquals(entry.getAuthor(), values.get(Field.AUTHOR)); + Assert.assertEquals(entry.getPublishedDate(), RSSGenerator.DATE_PARSER.parse((String) values.get(Field.TIME))); } protected File getFeedFile() { Modified: trunk/src/test/java/org/nuiton/rss/RSSTest.java =================================================================== --- trunk/src/test/java/org/nuiton/rss/RSSTest.java 2009-11-26 14:28:00 UTC (rev 161) +++ trunk/src/test/java/org/nuiton/rss/RSSTest.java 2009-11-26 17:25:13 UTC (rev 162) @@ -1,4 +1,4 @@ -/** +/* * *##% LutinRSS * Copyright (C) 2008 CodeLutin * @@ -16,28 +16,24 @@ * License along with this program. If not, see * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* */ -/* - * To change this template, choose Tools | Templates - * and open the template in the editor. - */ package org.nuiton.rss; import java.util.ArrayList; import java.util.List; -import junit.framework.TestCase; + import org.apache.commons.beanutils.BeanUtils; +import org.junit.Assert; +import org.junit.Ignore; +import org.junit.Test; /** * * @author poussin */ -public class RSSTest extends TestCase { - - public RSSTest(String testName) { - super(testName); - } +public class RSSTest { + @Test public void testBeanUtils() throws Exception { // RSSConfig.class.getField("TIME_FORCE_RETRIEVED").set(null, 10); System.out.println("TIME:" + RSSConfig.TIME_FORCE_RETRIEVED); @@ -46,16 +42,18 @@ BeanUtils.setProperty(new RSSConfig(), "DEFAULT_RENDERER_CLASS", FeedRenderer.class.getName()); System.out.println("TIME:" + RSSConfig.TIME_FORCE_RETRIEVED); System.out.println("RENDER:" + RSSConfig.DEFAULT_RENDERER_CLASS); - assertEquals("java.lang.String", BeanUtils.getProperty("Object", "class.name")); + Assert.assertEquals("java.lang.String", BeanUtils.getProperty("Object", "class.name")); } + @Test public void testCleaner() throws Exception { String s = "debut<Script src='toto.js'>et du script</scRipt>milieu<scripT>encore du code\n</script>fin"; HTMLCleaner cleaner = new HTMLScriptCleaner(); - assertEquals("debutmilieufin", cleaner.clean(s)); + Assert.assertEquals("debutmilieufin", cleaner.clean(s)); } + @Test public void testRendererConfig() throws Exception { FeedRendererConfig c = new FeedRendererConfig("indat-ndat"); @@ -72,9 +70,9 @@ l2.add(Field.AUTHOR); l2.add(Field.TIME); - assertEquals(l1, c.getFeedFieldOrder()); - assertEquals(l2, c.getItemFieldOrder()); - assertEquals("indat-ndat", c.getString()); + Assert.assertEquals(l1, c.getFeedFieldOrder()); + Assert.assertEquals(l2, c.getItemFieldOrder()); + Assert.assertEquals("indat-ndat", c.getString()); } /** @@ -82,7 +80,8 @@ * TODO do the test, for the moment, do not launch it... * @throws Exception if any pb */ - public void _testGetHTML() throws Exception { + @Ignore + public void testGetHTML() throws Exception { System.out.println("getHTML"); String feedName = "http://localhost/rss/rss_1.0.xml"; String feedRepr = "n-ndat";

1 0

r161 - trunk
by echatellier＠users.nuiton.org Nov. 26, 2009

Nov. 26, 2009

Author: echatellier Date: 2009-11-26 15:28:00 +0100 (Thu, 26 Nov 2009) New Revision: 161 Modified: trunk/pom.xml Log: Update beanutils, rome, servlet-api Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-02 07:44:50 UTC (rev 160) +++ trunk/pom.xml 2009-11-26 14:28:00 UTC (rev 161) @@ -32,7 +32,7 @@ <dependency> <groupId>commons-beanutils</groupId> <artifactId>commons-beanutils</artifactId> - <version>1.7.0</version> + <version>1.8.2</version> <scope>compile</scope> </dependency> <dependency> @@ -44,7 +44,7 @@ <dependency> <groupId>rome</groupId> <artifactId>rome</artifactId> - <version>0.9</version> + <version>1.0</version> <scope>compile</scope> </dependency> @@ -59,7 +59,7 @@ <dependency> <groupId>javax.servlet</groupId> <artifactId>servlet-api</artifactId> - <version>2.4</version> + <version>2.5</version> <scope>provided</scope> </dependency> </dependencies>

1 0

r160 - trunk
by tchemit＠users.nuiton.org Nov. 2, 2009

Nov. 2, 2009

Author: tchemit Date: 2009-11-02 08:44:50 +0100 (Mon, 02 Nov 2009) New Revision: 160 Modified: trunk/pom.xml Log: fix jredmine config Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-02 03:46:12 UTC (rev 159) +++ trunk/pom.xml 2009-11-02 07:44:50 UTC (rev 160) @@ -81,6 +81,9 @@ <properties> +  + <redmine.releaseFiles>${redmine.libReleaseFiles}</redmine.releaseFiles> + </properties> <build>

1 0

r159 - trunk
by tchemit＠users.nuiton.org Nov. 2, 2009

Nov. 2, 2009

Author: tchemit Date: 2009-11-02 04:46:12 +0100 (Mon, 02 Nov 2009) New Revision: 159 Modified: trunk/pom.xml Log: use mavenpom 1.1.0 Modified: trunk/pom.xml =================================================================== --- trunk/pom.xml 2009-11-02 03:44:08 UTC (rev 158) +++ trunk/pom.xml 2009-11-02 03:46:12 UTC (rev 159) @@ -1,6 +1,6 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> -<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> - <modelVersion>4.0.0</modelVersion>  @@ -9,7 +9,7 @@ <parent> <groupId>org.nuiton</groupId> <artifactId>mavenpom</artifactId> - <version>1.1.0-SNAPSHOT</version> + <version>1.1.0</version> </parent> <artifactId>nuiton-rss</artifactId> @@ -112,7 +112,7 @@ <plugin> <artifactId>maven-war-plugin</artifactId> <configuration> -  +  <webappDirectory>target/lutinrss</webappDirectory> </configuration> </plugin> @@ -193,5 +193,5 @@ </build> </profile> </profiles> - + </project>

1 0

r158 - trunk
by tchemit＠users.nuiton.org Nov. 2, 2009

Nov. 2, 2009

Author: tchemit Date: 2009-11-02 04:44:08 +0100 (Mon, 02 Nov 2009) New Revision: 158 Modified: trunk/ Log: svn ignore idea files Property changes on: trunk ___________________________________________________________________ Modified: svn:ignore - lutinrss.iws target profiles.xml lutinrss.ipr target/* nbactions.xml + *.iws target profiles.xml *.ipr *.iml target/* nbactions.xml

1 0

r157 - trunk/src/main/java/org/nuiton/rss
by tchemit＠users.nuiton.org Nov. 2, 2009

Nov. 2, 2009

Author: tchemit Date: 2009-11-02 04:33:09 +0100 (Mon, 02 Nov 2009) New Revision: 157 Modified: trunk/src/main/java/org/nuiton/rss/RSSHelper.java Log: reformat + improve code Modified: trunk/src/main/java/org/nuiton/rss/RSSHelper.java =================================================================== --- trunk/src/main/java/org/nuiton/rss/RSSHelper.java 2009-10-11 11:27:51 UTC (rev 156) +++ trunk/src/main/java/org/nuiton/rss/RSSHelper.java 2009-11-02 03:33:09 UTC (rev 157) @@ -20,54 +20,57 @@ * To change this template, choose Tools | Templates * and open the template in the editor. */ - package org.nuiton.rss; import com.sun.syndication.feed.synd.SyndEntry; import com.sun.syndication.feed.synd.SyndFeed; -import java.net.MalformedURLException; -import java.util.List; import org.apache.commons.collections.map.ReferenceMap; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import java.net.MalformedURLException; +import java.util.List; + /** - * * @author poussin */ public class RSSHelper { - /** to use log facility, just put in your code: log.info(\"...\"); */ + /** + * to use log facility, just put in your code: log.info(\"...\"); + */ static final Log log = LogFactory.getLog(RSSHelper.class); /** - * * @return une nouvelle instance de RssHelper en utilisant les implantations - * definies dans RSSConfig. + * definies dans RSSConfig. * @throws java.lang.Exception pour tout pb lors de l'instanciation des objects */ public static RSSHelper newDefaultInstance() throws Exception { FeedURLResolver r = RSSConfig.DEFAULT_RESOLVER_CLASS.newInstance(); - FeedRenderer rr = RSSConfig.DEFAULT_RENDERER_CLASS.newInstance(); - RSSHelper helper = new RSSHelper(r,rr); + FeedRenderer rr = RSSConfig.DEFAULT_RENDERER_CLASS.newInstance(); + RSSHelper helper = new RSSHelper(r, rr); return helper; } - - /** La classe permettant de resoudre les urls */ + + /** + * La classe permettant de resoudre les urls + */ protected FeedURLResolver resolver = null; - /** on utilise des soft reference pour eviter de trop utiliser la memoire - key: String, value: FeedData */ + /** + * on utilise des soft reference pour eviter de trop utiliser la memoire + * key: String, value: FeedData + */ protected ReferenceMap feeds = new ReferenceMap(ReferenceMap.HARD, ReferenceMap.SOFT); - protected FeedRenderer renderer = null; - + /** * Utilise un SimpleFeedURLResolver comme resolver de feed */ public RSSHelper() { this(new SimpleFeedURLResolver(), new FeedHTMLRenderer(new HTMLScriptCleaner())); } - + public RSSHelper(FeedURLResolver resolver, FeedRenderer renderer) { this.resolver = resolver; this.renderer = renderer; @@ -88,18 +91,18 @@ public FeedURLResolver getResolver() { return resolver; } - - public void removeFeed(String feedName) { + + public void removeFeed(String feedName) { feeds.remove(feedName); } - + /** * Permet de recuperer un certain nombre d'item du feed demande - * - * @param feedName nom du feed souhaite, l'url sera resolu avec le FeedURLResolver + * + * @param feedName nom du feed souhaite, l'url sera resolu avec le FeedURLResolver * @param representation indique les champs en sortie souhaites (ex: n-nt) - * @param nbItem le nombre d'item du feed souhaite - * @param forceReload un flag pour forcer la relecture du feed + * @param nbItem le nombre d'item du feed souhaite + * @param forceReload un flag pour forcer la relecture du feed * @return le code html representant le feed */ public String getHTML(String feedName, String representation, Integer nbItem, boolean forceReload) { @@ -107,8 +110,8 @@ FeedData feed = (FeedData) feeds.get(feedName); if (forceReload || feed == null || feed.getLastRetrived() + RSSConfig.TIME_FORCE_RETRIEVED < System.currentTimeMillis()) { feed = resolver.resolv(feedName); - if (feed==null) { - log.warn("could not find feed for "+feedName); + if (feed == null) { + log.warn("could not find feed for " + feedName); return "<span class='feed-error'>No feed found for " + feedName + "</span>"; } feeds.put(feedName, feed); @@ -120,22 +123,22 @@ } else { c = feed.getRendererConfig(); } - + int nb; if (nbItem != null) { nb = nbItem; } else { nb = feed.getNbItem(); } - + SyndFeed sf = feed.getFeed(); //TODO Deal with NPE... if feed is null - List syndEntries = sf.getEntries(); + List<?> syndEntries = sf.getEntries(); if (nb >= 0 && syndEntries.size() >= nb) { syndEntries = syndEntries.subList(syndEntries.size() - nb, syndEntries.size()); } - SyndEntry [] items = (SyndEntry[])syndEntries.toArray(new SyndEntry[syndEntries.size()]); - + SyndEntry[] items = syndEntries.toArray(new SyndEntry[syndEntries.size()]); + String result = renderer.render(c, sf, items); return result; } catch (MalformedURLException eee) {

1 0