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";