Modified: roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/business/WeblogEntryTest.java URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/business/WeblogEntryTest.java?rev=1588757&r1=1588756&r2=1588757&view=diff ============================================================================== --- roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/business/WeblogEntryTest.java (original) +++ roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/business/WeblogEntryTest.java Sun Apr 20 13:38:51 2014 @@ -25,7 +25,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.HashMap; import java.util.HashSet; -import java.util.Iterator; import java.util.List; import java.util.Map; import junit.framework.Test; @@ -39,6 +38,7 @@ import org.apache.roller.weblogger.pojos import org.apache.roller.weblogger.pojos.User; import org.apache.roller.weblogger.pojos.WeblogCategory; import org.apache.roller.weblogger.pojos.WeblogEntry; +import org.apache.roller.weblogger.pojos.WeblogEntrySearchCriteria; import org.apache.roller.weblogger.pojos.WeblogEntryTag; import org.apache.roller.weblogger.pojos.Weblog; @@ -108,7 +108,7 @@ public class WeblogEntryTest extends Tes public void testWeblogEntryCRUD() throws Exception { WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager(); - WeblogEntry entry = null; + WeblogEntry entry; WeblogEntry testEntry = new WeblogEntry(); testEntry.setTitle("entryTestEntry"); @@ -119,8 +119,8 @@ public class WeblogEntryTest extends Tes testEntry.setUpdateTime(new java.sql.Timestamp(new java.util.Date().getTime())); testEntry.setWebsite(testWeblog); testEntry.setCreatorUserName(testUser.getUserName()); - - WeblogCategory cat = mgr.getWeblogCategory(testWeblog.getDefaultCategory().getId()); + + WeblogCategory cat = testWeblog.getDefaultCategory(); testEntry.setCategory(cat); // create a weblog entry @@ -139,7 +139,6 @@ public class WeblogEntryTest extends Tes TestUtils.endSession(true); // make sure entry was updated - entry = null; entry = mgr.getWeblogEntry(id); assertNotNull(entry); assertEquals("testtest", entry.getTitle()); @@ -149,7 +148,6 @@ public class WeblogEntryTest extends Tes TestUtils.endSession(true); // make sure entry was deleted - entry = null; entry = mgr.getWeblogEntry(id); assertNull(entry); } @@ -161,10 +159,10 @@ public class WeblogEntryTest extends Tes public void testWeblogEntryLookups() throws Exception { WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager(); - WeblogEntry entry = null; - List entries = null; - Map entryMap = null; - + WeblogEntry entry; + List entries; + Map entryMap; + // setup some test entries to use testWeblog = TestUtils.getManagedWebsite(testWeblog); testUser = TestUtils.getManagedUser(testUser); @@ -210,97 +208,110 @@ public class WeblogEntryTest extends Tes entry5 = TestUtils.getManagedWeblogEntry(entry5); // get entry by id - entry = null; entry = mgr.getWeblogEntry(entry1.getId()); assertNotNull(entry); assertEquals(entry1.getAnchor(), entry.getAnchor()); // get entry by anchor - entry = null; entry = mgr.getWeblogEntryByAnchor(testWeblog, entry1.getAnchor()); assertNotNull(entry); assertEquals(entry1.getTitle(), entry.getTitle()); // get all entries for weblog - entries = null; - entries = mgr.getWeblogEntries(testWeblog, null, null, null, null, null, null, null, null, null, null, 0, -1); + WeblogEntrySearchCriteria wesc = new WeblogEntrySearchCriteria(); + wesc.setWeblog(testWeblog); + entries = mgr.getWeblogEntries(wesc); assertNotNull(entries); assertEquals(5, entries.size()); assertEquals(entry3, entries.get(0)); // get all (non-future) PUBLISHED entries in category - entries = null; - entries = mgr.getWeblogEntries(testWeblog.getDefaultCategory(), false); + WeblogEntrySearchCriteria wesc9 = new WeblogEntrySearchCriteria(); + wesc9.setWeblog(testWeblog); + wesc9.setCatName(testWeblog.getDefaultCategory().getName()); + wesc9.setStatus(WeblogEntry.PUBLISHED); + entries = mgr.getWeblogEntries(wesc9); assertNotNull(entries); assertEquals(3, entries.size()); // get all (non-future) PUBLISHED entries only - entries = null; - entries = mgr.getWeblogEntries(testWeblog, null, null, null, null, null, WeblogEntry.PUBLISHED, null, null, null, null, 0, -1); + WeblogEntrySearchCriteria wesc2 = new WeblogEntrySearchCriteria(); + wesc2.setWeblog(testWeblog); + wesc2.setStatus(WeblogEntry.PUBLISHED); + entries = mgr.getWeblogEntries(wesc2); assertNotNull(entries); assertEquals(3, entries.size()); // get all entries in date range - entries = null; - entries = mgr.getWeblogEntries(testWeblog, null, entry2.getPubTime(), entry2.getPubTime(), null, null, null, null, null, null, null, 0, -1); + WeblogEntrySearchCriteria wesc3 = new WeblogEntrySearchCriteria(); + wesc3.setWeblog(testWeblog); + wesc3.setStartDate(entry2.getPubTime()); + wesc3.setEndDate(entry2.getPubTime()); + entries = mgr.getWeblogEntries(wesc3); assertNotNull(entries); assertEquals(1, entries.size()); assertEquals(entry2, entries.get(0)); // get all entries, limited to maxSize - entries = null; - entries = mgr.getWeblogEntries(testWeblog, null, null, null, null, null, null, null, null, null, null, 0, 2); + WeblogEntrySearchCriteria wesc4 = new WeblogEntrySearchCriteria(); + wesc4.setWeblog(testWeblog); + wesc4.setMaxResults(2); + entries = mgr.getWeblogEntries(wesc4); assertNotNull(entries); assertEquals(2, entries.size()); // get all entries in category - entries = null; - entries = mgr.getWeblogEntries(testWeblog, null, null, null, testWeblog.getDefaultCategory().getName(), null, null, null, null, null, null, 0, -1); + WeblogEntrySearchCriteria wesc5 = new WeblogEntrySearchCriteria(); + wesc5.setWeblog(testWeblog); + wesc5.setCatName(testWeblog.getDefaultCategory().getName()); + entries = mgr.getWeblogEntries(wesc5); assertNotNull(entries); assertEquals(5, entries.size()); // get all entries, limited by offset/range - entries = null; - entries = mgr.getWeblogEntries(testWeblog, null, null, null, null, null, null, null, null, null, null, 1, 1); + WeblogEntrySearchCriteria wesc6 = new WeblogEntrySearchCriteria(); + wesc6.setWeblog(testWeblog); + wesc6.setOffset(1); + wesc6.setMaxResults(1); + entries = mgr.getWeblogEntries(wesc6); assertNotNull(entries); assertEquals(1, entries.size()); assertEquals(entry2, entries.get(0)); // get all entries, limited by locale - entries = null; - entries = mgr.getWeblogEntries(testWeblog, null, null, null, null, null, null, null, null, null, "en_US", 0, -1); + WeblogEntrySearchCriteria wesc7 = new WeblogEntrySearchCriteria(); + wesc7.setWeblog(testWeblog); + wesc7.setLocale("en_US"); + entries = mgr.getWeblogEntries(wesc7); assertNotNull(entries); assertEquals(4, entries.size()); assertEquals(entry3, entries.get(0)); // get pinned entries only - entries = null; - entries = mgr.getWeblogEntriesPinnedToMain(new Integer(5)); + entries = mgr.getWeblogEntriesPinnedToMain(5); assertNotNull(entries); assertEquals(1, entries.size()); assertEquals(entry1, entries.get(0)); // get next entry - entry = null; entry = mgr.getNextEntry(entry4, null, null); assertNotNull(entry); assertEquals(entry5, entry); // get previous entry - entry = null; entry = mgr.getPreviousEntry(entry5, null, null); assertNotNull(entry); assertEquals(entry4, entry); // get object map - entryMap = null; - entryMap = mgr.getWeblogEntryObjectMap(testWeblog, null, null, null, null, null, null, 0, -1); + WeblogEntrySearchCriteria wesc8 = new WeblogEntrySearchCriteria(); + wesc8.setWeblog(testWeblog); + entryMap = mgr.getWeblogEntryObjectMap(wesc8); assertNotNull(entryMap); assertTrue(entryMap.keySet().size() > 1); // get string map - entryMap = null; - entryMap = mgr.getWeblogEntryStringMap(testWeblog, null, null, null, null, null, null, 0, -1); + entryMap = mgr.getWeblogEntryStringMap(wesc8); assertNotNull(entryMap); assertTrue(entryMap.keySet().size() > 1); @@ -310,21 +321,18 @@ public class WeblogEntryTest extends Tes TestUtils.teardownWeblogEntry(entry3.getId()); TestUtils.endSession(true); } - - + /** * Test that the createAnchor() method actually ensures unique anchors. */ public void testCreateAnchor() throws Exception { WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager(); - WeblogEntry entry = null; - List entries = null; - + // setup some test entries to use testWeblog = TestUtils.getManagedWebsite(testWeblog); testUser = TestUtils.getManagedUser(testUser); - WeblogEntry entry1 = TestUtils.setupWeblogEntry("entry1", testWeblog.getDefaultCategory(), testWeblog, testUser); + WeblogEntry entry1 = TestUtils.setupWeblogEntry("entry1", testWeblog, testUser); TestUtils.endSession(true); // make sure createAnchor gives us a new anchor value @@ -336,7 +344,7 @@ public class WeblogEntryTest extends Tes // make sure we can create a new entry with specified anchor testWeblog = TestUtils.getManagedWebsite(testWeblog); testUser = TestUtils.getManagedUser(testUser); - WeblogEntry entry2 = TestUtils.setupWeblogEntry(anchor, testWeblog.getDefaultCategory(), testWeblog, testUser); + WeblogEntry entry2 = TestUtils.setupWeblogEntry(anchor, testWeblog, testUser); TestUtils.endSession(true); assertNotNull(entry2); @@ -345,11 +353,11 @@ public class WeblogEntryTest extends Tes TestUtils.teardownWeblogEntry(entry2.getId()); TestUtils.endSession(true); } - + public void testCreateAnEntryWithTagsShortcut() throws Exception { try { WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager(); - WeblogEntry entry = null; + WeblogEntry entry; testWeblog = TestUtils.getManagedWebsite(testWeblog); testUser = TestUtils.getManagedUser(testUser); @@ -380,7 +388,7 @@ public class WeblogEntryTest extends Tes assertEquals(testEntry, entry); assertNotNull(entry.getTags()); assertEquals(1, entry.getTags().size()); - assertEquals("testtag", ((WeblogEntryTag) entry.getTags() + assertEquals("testtag", (entry.getTags() .iterator().next()).getName()); TestUtils.endSession(true); @@ -403,8 +411,7 @@ public class WeblogEntryTest extends Tes // setup some test entries to use testWeblog = TestUtils.getManagedWebsite(testWeblog); testUser = TestUtils.getManagedUser(testUser); - WeblogEntry entry = TestUtils.setupWeblogEntry("entry1", testWeblog - .getDefaultCategory(), testWeblog, testUser); + WeblogEntry entry = TestUtils.setupWeblogEntry("entry1", testWeblog, testUser); entry.addTag("testTag"); entry.addTag("whateverTag"); String id = entry.getId(); @@ -431,8 +438,7 @@ public class WeblogEntryTest extends Tes // setup some test entries to use testWeblog = TestUtils.getManagedWebsite(testWeblog); testUser = TestUtils.getManagedUser(testUser); - WeblogEntry entry = TestUtils.setupWeblogEntry("entry1", testWeblog - .getDefaultCategory(), testWeblog, testUser); + WeblogEntry entry = TestUtils.setupWeblogEntry("entry1", testWeblog, testUser); entry.addTag("testTag"); String id = entry.getId(); mgr.saveWeblogEntry(entry); @@ -450,7 +456,7 @@ public class WeblogEntryTest extends Tes TestUtils.teardownWeblogEntry(id); TestUtils.endSession(true); } - + public void testRemoveTagsViaShortcut() throws Exception { try { WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager(); @@ -458,8 +464,7 @@ public class WeblogEntryTest extends Tes // setup some test entries to use testWeblog = TestUtils.getManagedWebsite(testWeblog); testUser = TestUtils.getManagedUser(testUser); - WeblogEntry entry = TestUtils.setupWeblogEntry("entry1", testWeblog - .getDefaultCategory(), testWeblog, testUser); + WeblogEntry entry = TestUtils.setupWeblogEntry("entry1", testWeblog, testUser); entry.addTag("testTag"); entry.addTag("testTag2"); String id = entry.getId(); @@ -502,15 +507,13 @@ public class WeblogEntryTest extends Tes String wid = weblog.getId(); // setup some test entries to use - WeblogEntry entry = TestUtils.setupWeblogEntry("tagsExistEntry1", - testWeblog.getDefaultCategory(), testWeblog, testUser); + WeblogEntry entry = TestUtils.setupWeblogEntry("tagsExistEntry1", testWeblog, testUser); String id1 = entry.getId(); entry.addTag("blahTag"); entry.addTag("fooTag"); mgr.saveWeblogEntry(entry); - WeblogEntry entry2 = TestUtils.setupWeblogEntry("tagsExistEntry2", - weblog.getDefaultCategory(), weblog, testUser); + WeblogEntry entry2 = TestUtils.setupWeblogEntry("tagsExistEntry2", weblog, testUser); String id2 = entry2.getId(); entry2.addTag("aaaTag"); entry2.addTag("bbbTag"); @@ -518,22 +521,22 @@ public class WeblogEntryTest extends Tes TestUtils.endSession(true); // we'll need these - List tags1 = new ArrayList(); + List<String> tags1 = new ArrayList<String>(); tags1.add("nonExistTag"); - List tags2 = new ArrayList(); + List<String> tags2 = new ArrayList<String>(); tags2.add("blahtag"); // test site-wide - this.assertTrue(mgr.getTagComboExists(tags2, null)); - this.assertFalse(mgr.getTagComboExists(tags1, null)); + assertTrue(mgr.getTagComboExists(tags2, null)); + assertFalse(mgr.getTagComboExists(tags1, null)); // test weblog specific testWeblog = TestUtils.getManagedWebsite(testWeblog); weblog = TestUtils.getManagedWebsite(weblog); - this.assertTrue(mgr.getTagComboExists(tags2, testWeblog)); - this.assertFalse(mgr.getTagComboExists(tags1, testWeblog)); - this.assertFalse(mgr.getTagComboExists(tags2, weblog)); + assertTrue(mgr.getTagComboExists(tags2, testWeblog)); + assertFalse(mgr.getTagComboExists(tags1, testWeblog)); + assertFalse(mgr.getTagComboExists(tags2, weblog)); // teardown our test data TestUtils.teardownWeblogEntry(id1); @@ -551,8 +554,7 @@ public class WeblogEntryTest extends Tes // setup some test entries to use testWeblog = TestUtils.getManagedWebsite(testWeblog); testUser = TestUtils.getManagedUser(testUser); - WeblogEntry entry = TestUtils.setupWeblogEntry("entry1", - testWeblog.getDefaultCategory(), testWeblog, testUser); + WeblogEntry entry = TestUtils.setupWeblogEntry("entry1", testWeblog, testUser); String id = entry.getId(); entry.addTag("testTag"); mgr.saveWeblogEntry(entry); @@ -560,8 +562,11 @@ public class WeblogEntryTest extends Tes testWeblog = TestUtils.getManagedWebsite(testWeblog); - List results = mgr.getWeblogEntries(testWeblog, null, null, null, null, - Arrays.asList(new String[] { "testtag" }), null, null, null, null, null, 0, -1); + WeblogEntrySearchCriteria wesc = new WeblogEntrySearchCriteria(); + wesc.setWeblog(testWeblog); + // tags are always saved lowercase (testTag -> testtag) + wesc.setTags(Arrays.asList("testtag")); + List results = mgr.getWeblogEntries(wesc); assertEquals(1, results.size()); WeblogEntry testEntry = (WeblogEntry) results.iterator().next(); assertEquals(entry, testEntry); @@ -578,7 +583,7 @@ public class WeblogEntryTest extends Tes } } - + public void testRemoveEntryTagCascading() throws Exception { WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager(); @@ -586,16 +591,18 @@ public class WeblogEntryTest extends Tes // setup some test entries to use testWeblog = TestUtils.getManagedWebsite(testWeblog); testUser = TestUtils.getManagedUser(testUser); - WeblogEntry entry = TestUtils.setupWeblogEntry("entry1", testWeblog - .getDefaultCategory(), testWeblog, testUser); + WeblogEntry entry = TestUtils.setupWeblogEntry("entry1", testWeblog, testUser); entry.addTag("testTag"); String id = entry.getId(); mgr.saveWeblogEntry(entry); TestUtils.endSession(true); testWeblog = TestUtils.getManagedWebsite(testWeblog); - List results = mgr.getWeblogEntries(testWeblog, null, null, null, null, - Arrays.asList(new String[] { "testtag" }), null, null, null, null, null, 0, -1); + WeblogEntrySearchCriteria wesc = new WeblogEntrySearchCriteria(); + wesc.setWeblog(testWeblog); + // tags are always saved lowercase (testTag -> testtag) + wesc.setTags(Arrays.asList("testtag")); + List results = mgr.getWeblogEntries(wesc); assertEquals(1, results.size()); WeblogEntry testEntry = (WeblogEntry) results.iterator().next(); assertEquals(entry, testEntry); @@ -605,8 +612,7 @@ public class WeblogEntryTest extends Tes TestUtils.endSession(true); testWeblog = TestUtils.getManagedWebsite(testWeblog); - results = mgr.getWeblogEntries(testWeblog, null, null, null, null, - Arrays.asList(new String[] { "testtag" }), null, null, null, null, null, 0, -1); + results = mgr.getWeblogEntries(wesc); assertEquals(0, results.size()); // terminate @@ -614,14 +620,12 @@ public class WeblogEntryTest extends Tes } public void testUpdateTags() throws Exception { - WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager(); // setup some test entries to use testWeblog = TestUtils.getManagedWebsite(testWeblog); testUser = TestUtils.getManagedUser(testUser); - WeblogEntry entry = TestUtils.setupWeblogEntry("entry1", testWeblog - .getDefaultCategory(), testWeblog, testUser); + WeblogEntry entry = TestUtils.setupWeblogEntry("entry1", testWeblog, testUser); entry.addTag("testWillStayTag"); entry.addTag("testTagWillBeRemoved"); String id = entry.getId(); @@ -631,7 +635,7 @@ public class WeblogEntryTest extends Tes entry = mgr.getWeblogEntry(id); assertEquals(2, entry.getTags().size()); - List updateTags = new ArrayList(); + List<String> updateTags = new ArrayList<String>(); updateTags.add("testwillstaytag"); updateTags.add("testnewtag"); updateTags.add("testnewtag3"); @@ -640,9 +644,8 @@ public class WeblogEntryTest extends Tes TestUtils.endSession(true); entry = mgr.getWeblogEntry(id); - HashSet tagNames = new HashSet(); - for (Iterator it = entry.getTags().iterator(); it.hasNext();) { - WeblogEntryTag tagData = (WeblogEntryTag) it.next(); + HashSet<String> tagNames = new HashSet<String>(); + for (WeblogEntryTag tagData : entry.getTags()) { tagNames.add(tagData.getName()); } @@ -663,15 +666,13 @@ public class WeblogEntryTest extends Tes * * @throws Exception */ - public void testUpdateTagTime() throws Exception { - - WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager(); + public void testUpdateTagTime() throws Exception { + WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager(); // setup some test entries to use testWeblog = TestUtils.getManagedWebsite(testWeblog); testUser = TestUtils.getManagedUser(testUser); - WeblogEntry entry = TestUtils.setupWeblogEntry("entry1", testWeblog - .getDefaultCategory(), testWeblog, testUser); + WeblogEntry entry = TestUtils.setupWeblogEntry("entry1", testWeblog, testUser); String id = entry.getId(); entry.addTag("testWillStayTag"); @@ -684,13 +685,12 @@ public class WeblogEntryTest extends Tes Timestamp original = null; - for (Iterator it = entry.getTags().iterator(); it.hasNext();) { - WeblogEntryTag tagData = (WeblogEntryTag) it.next(); + for (WeblogEntryTag tagData : entry.getTags()) { if (tagData.getName().equals("testwillstaytag")) original = tagData.getTime(); } - List updateTags = new ArrayList(); + List<String> updateTags = new ArrayList<String>(); updateTags.add("testwillstaytag"); updateTags.add("testnewtag"); updateTags.add("testnewtag3"); @@ -699,12 +699,12 @@ public class WeblogEntryTest extends Tes TestUtils.endSession(true); entry = mgr.getWeblogEntry(id); - HashSet tagNames = new HashSet(); - for (Iterator it = entry.getTags().iterator(); it.hasNext();) { - WeblogEntryTag tagData = (WeblogEntryTag) it.next(); + HashSet<String> tagNames = new HashSet<String>(); + for (WeblogEntryTag tagData : entry.getTags()) { tagNames.add(tagData.getName()); - if (tagData.getName().equals("testwillstaytag")) + if (tagData.getName().equals("testwillstaytag")) { assertEquals(original, tagData.getTime()); + } } assertEquals(3, entry.getTags().size()); @@ -720,18 +720,17 @@ public class WeblogEntryTest extends Tes public void testTagAggregates() throws Exception { log.info("BEGIN"); - WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager(); testWeblog = TestUtils.getManagedWebsite(testWeblog); testUser = TestUtils.getManagedUser(testUser); Weblog testWeblog2 = TestUtils.setupWeblog("entryTestWeblog2", testUser); - + try { // let's make sure we are starting from scratch // site-wide - List tags = mgr.getTags(null, null, null, 0, -1); + List<TagStat> tags = mgr.getTags(null, null, null, 0, -1); assertEquals(0, tags.size()); // first weblog @@ -743,14 +742,12 @@ public class WeblogEntryTest extends Tes assertEquals(0, tags.size()); // setup some test entries to use - WeblogEntry entry = TestUtils.setupWeblogEntry("entry1", - testWeblog.getDefaultCategory(), testWeblog, testUser); + WeblogEntry entry = TestUtils.setupWeblogEntry("entry1", testWeblog, testUser); entry.addTag("one"); entry.addTag("two"); mgr.saveWeblogEntry(entry); - entry = TestUtils.setupWeblogEntry("entry2", - testWeblog.getDefaultCategory(), testWeblog, testUser); + entry = TestUtils.setupWeblogEntry("entry2", testWeblog, testUser); entry.addTag("one"); entry.addTag("two"); entry.addTag("three"); @@ -762,25 +759,23 @@ public class WeblogEntryTest extends Tes tags = mgr.getTags(testWeblog, null, null, 0, -1); assertEquals(3, tags.size()); - HashMap expectedWeblogTags = new HashMap(); - expectedWeblogTags.put("one", new Integer(2)); - expectedWeblogTags.put("two", new Integer(2)); - expectedWeblogTags.put("three", new Integer(1)); - - for (Iterator it = tags.iterator(); it.hasNext();) { - TagStat stat = (TagStat) it.next(); - if (!expectedWeblogTags.containsKey(stat.getName())) - fail("Unexpected tagName."); + HashMap<String,Integer> expectedWeblogTags = new HashMap<String,Integer>(); + expectedWeblogTags.put("one", 2); + expectedWeblogTags.put("two", 2); + expectedWeblogTags.put("three", 1); - Integer expectedCount = (Integer)expectedWeblogTags.get(stat.getName()); + for (TagStat stat : tags) { + if (!expectedWeblogTags.containsKey(stat.getName())) { + fail("Unexpected tagName."); + } + Integer expectedCount = expectedWeblogTags.get(stat.getName()); assertEquals(expectedCount.intValue(), stat.getCount()); } // now add another entry in another blog testWeblog2 = TestUtils.getManagedWebsite(testWeblog2); testUser = TestUtils.getManagedUser(testUser); - entry = TestUtils.setupWeblogEntry("entry3", - testWeblog2.getDefaultCategory(), testWeblog2, testUser); + entry = TestUtils.setupWeblogEntry("entry3", testWeblog2, testUser); entry.addTag("one"); entry.addTag("three"); entry.addTag("four"); @@ -792,18 +787,17 @@ public class WeblogEntryTest extends Tes tags = mgr.getTags(null, null, null, 0, -1); assertEquals(4, tags.size()); - HashMap expectedSiteTags = new HashMap(); - expectedSiteTags.put("one", new Integer(3)); - expectedSiteTags.put("two", new Integer(2)); - expectedSiteTags.put("three", new Integer(2)); - expectedSiteTags.put("four", new Integer(1)); + HashMap<String, Integer> expectedSiteTags = new HashMap<String, Integer>(); + expectedSiteTags.put("one", 3); + expectedSiteTags.put("two", 2); + expectedSiteTags.put("three", 2); + expectedSiteTags.put("four", 1); - for (Iterator it = tags.iterator(); it.hasNext();) { - TagStat stat = (TagStat) it.next(); + for (TagStat stat : tags) { if (!expectedSiteTags.containsKey(stat.getName())) fail("Unexpected tagName."); - Integer expectedCount = (Integer) expectedSiteTags.get(stat.getName()); + Integer expectedCount = expectedSiteTags.get(stat.getName()); assertEquals(expectedCount.intValue(), stat.getCount()); } @@ -811,7 +805,7 @@ public class WeblogEntryTest extends Tes testWeblog = TestUtils.getManagedWebsite(testWeblog); entry = mgr.getWeblogEntryByAnchor(testWeblog, "entry2"); - List updateTags = new ArrayList(); + List<String> updateTags = new ArrayList<String>(); updateTags.add("one"); updateTags.add("three"); updateTags.add("five"); @@ -824,50 +818,49 @@ public class WeblogEntryTest extends Tes tags = mgr.getTags(testWeblog, null, null, 0, -1); assertEquals(4, tags.size()); - expectedWeblogTags = new HashMap(); - expectedWeblogTags.put("one", new Integer(2)); - expectedWeblogTags.put("two", new Integer(1)); - expectedWeblogTags.put("three", new Integer(1)); - expectedWeblogTags.put("five", new Integer(1)); - - for (Iterator it = tags.iterator(); it.hasNext();) { - TagStat stat = (TagStat) it.next(); - if (!expectedWeblogTags.containsKey(stat.getName())) - fail("Unexpected tagName."); + expectedWeblogTags = new HashMap<String, Integer>(); + expectedWeblogTags.put("one", 2); + expectedWeblogTags.put("two", 1); + expectedWeblogTags.put("three", 1); + expectedWeblogTags.put("five", 1); - Integer expectedCount = - (Integer)expectedWeblogTags.get(stat.getName()); - assertEquals(stat.getName(), + for (TagStat stat : tags) { + if (!expectedWeblogTags.containsKey(stat.getName())) { + fail("Unexpected tagName."); + } + Integer expectedCount = + expectedWeblogTags.get(stat.getName()); + assertEquals(stat.getName(), expectedCount.intValue(), stat.getCount()); } tags = mgr.getTags(null, null, null, 0, -1); assertEquals(5, tags.size()); - expectedSiteTags = new HashMap(); - expectedSiteTags.put("one", new Integer(3)); - expectedSiteTags.put("two", new Integer(1)); - expectedSiteTags.put("three", new Integer(2)); - expectedSiteTags.put("four", new Integer(1)); - expectedSiteTags.put("five", new Integer(1)); + expectedSiteTags = new HashMap<String, Integer>(); + expectedSiteTags.put("one", 3); + expectedSiteTags.put("two", 1); + expectedSiteTags.put("three", 2); + expectedSiteTags.put("four", 1); + expectedSiteTags.put("five", 1); - for (Iterator it = tags.iterator(); it.hasNext();) { - TagStat stat = (TagStat) it.next(); - if (!expectedSiteTags.containsKey(stat.getName())) + for (TagStat stat : tags) { + if (!expectedSiteTags.containsKey(stat.getName())) { fail("Unexpected tagName."); - - Integer expectedCount = (Integer)expectedSiteTags.get(stat.getName()); + } + Integer expectedCount = expectedSiteTags.get(stat.getName()); assertEquals(stat.getName(), expectedCount.intValue(), stat.getCount()); } - + TestUtils.teardownWeblog(testWeblog2.getId()); TestUtils.endSession(true); - + } catch (Throwable t) { StringWriter sw = new StringWriter(); PrintWriter pw = new PrintWriter(sw); t.printStackTrace(pw); - log.info(sw.toString()); + log.error(sw.toString()); + System.out.println(sw.toString()); } log.info("END"); @@ -885,7 +878,7 @@ public class WeblogEntryTest extends Tes // let's make sure we are starting from scratch // site-wide - List tags = mgr.getTags(null, null, null, 0, -1); + List<TagStat> tags = mgr.getTags(null, null, null, 0, -1); assertEquals(0, tags.size()); // first weblog @@ -897,8 +890,7 @@ public class WeblogEntryTest extends Tes assertEquals(0, tags.size()); // setup some test entries to use - WeblogEntry entry = TestUtils.setupWeblogEntry("entry1", testWeblog - .getDefaultCategory(), testWeblog, testUser); + WeblogEntry entry = TestUtils.setupWeblogEntry("entry1", testWeblog, testUser); entry.addTag("one"); entry.addTag("two"); entry.addTag("ONE"); @@ -909,22 +901,20 @@ public class WeblogEntryTest extends Tes tags = mgr.getTags(testWeblog, null, null, 0, -1); assertEquals(2, tags.size()); - HashMap expectedWeblogTags = new HashMap(); - expectedWeblogTags.put("one", new Integer(1)); - expectedWeblogTags.put("two", new Integer(1)); + HashMap<String, Integer> expectedWeblogTags = new HashMap<String, Integer>(); + expectedWeblogTags.put("one", 1); + expectedWeblogTags.put("two", 1); - for (Iterator it = tags.iterator(); it.hasNext();) { - TagStat stat = (TagStat) it.next(); + for (TagStat stat : tags) { if (!expectedWeblogTags.containsKey(stat.getName())) fail("Unexpected tagName."); - Integer expectedCount = (Integer) expectedWeblogTags.get(stat.getName()); + Integer expectedCount = expectedWeblogTags.get(stat.getName()); assertEquals(expectedCount.intValue(), stat.getCount()); } // now add another entry in another blog - entry = TestUtils.setupWeblogEntry("entry3", testWeblog2 - .getDefaultCategory(), testWeblog2, testUser); + entry = TestUtils.setupWeblogEntry("entry3", testWeblog2, testUser); entry.addTag("ONE"); entry.addTag("three"); mgr.saveWeblogEntry(entry); @@ -935,17 +925,16 @@ public class WeblogEntryTest extends Tes tags = mgr.getTags(null, null, null, 0, -1); assertEquals(3, tags.size()); - HashMap expectedSiteTags = new HashMap(); - expectedSiteTags.put("one", new Integer(2)); - expectedSiteTags.put("two", new Integer(1)); - expectedSiteTags.put("three", new Integer(1)); + HashMap<String, Integer> expectedSiteTags = new HashMap<String, Integer>(); + expectedSiteTags.put("one", 2); + expectedSiteTags.put("two", 1); + expectedSiteTags.put("three", 1); - for (Iterator it = tags.iterator(); it.hasNext();) { - TagStat stat = (TagStat) it.next(); + for (TagStat stat : tags) { if (!expectedSiteTags.containsKey(stat.getName())) fail("Unexpected tagName."); - Integer expectedCount = (Integer) expectedSiteTags.get(stat.getName()); + Integer expectedCount = expectedSiteTags.get(stat.getName()); assertEquals(expectedCount.intValue(), stat.getCount()); } @@ -955,17 +944,16 @@ public class WeblogEntryTest extends Tes TestUtils.teardownWeblog(testWeblog2.getId()); TestUtils.endSession(true); } - + /** * Test that we can add and remove entry attributes for an entry. */ - public void testEntryAttributeCRUD() throws Exception { + public void testEntryAttributeCRUD() throws Exception { - WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager(); WeblogEntryManager emgr = WebloggerFactory.getWeblogger().getWeblogEntryManager(); - WeblogEntry entry = null; + WeblogEntry entry; WeblogEntry testEntry = new WeblogEntry(); testEntry.setTitle("entryTestEntry"); @@ -977,7 +965,7 @@ public class WeblogEntryTest extends Tes testEntry.setWebsite(testWeblog); testEntry.setCreatorUserName(testUser.getUserName()); - WeblogCategory cat = emgr.getWeblogCategory(testWeblog.getDefaultCategory().getId()); + WeblogCategory cat = testWeblog.getDefaultCategory(); testEntry.setCategory(cat); // create a weblog entry @@ -1011,7 +999,6 @@ public class WeblogEntryTest extends Tes TestUtils.endSession(true); // make sure entry was updated - entry = null; entry = emgr.getWeblogEntry(id); assertNotNull(entry); assertEquals("testtest", entry.getTitle()); @@ -1021,15 +1008,13 @@ public class WeblogEntryTest extends Tes TestUtils.endSession(true); // make sure entry was deleted - entry = null; entry = emgr.getWeblogEntry(id); assertNull(entry); } public void testWeblogStats() throws Exception { - - + WeblogEntryManager emgr = WebloggerFactory.getWeblogger().getWeblogEntryManager(); WeblogManager wmgr = WebloggerFactory.getWeblogger().getWeblogManager(); UserManager umgr = WebloggerFactory.getWeblogger().getUserManager(); @@ -1044,17 +1029,12 @@ public class WeblogEntryTest extends Tes blog3.setEnabled(Boolean. FALSE); wmgr.saveWeblog(blog3); - WeblogEntry entry1 = TestUtils.setupWeblogEntry("entry1", - testWeblog.getDefaultCategory(), blog1, user1); - WeblogEntry entry2 = TestUtils.setupWeblogEntry("entry2", - testWeblog.getDefaultCategory(), blog1, user1); - - WeblogEntry entry3 = TestUtils.setupWeblogEntry("entry3", - testWeblog.getDefaultCategory(), blog2, user1); - WeblogEntry entry4 = TestUtils.setupWeblogEntry("entry4", - testWeblog.getDefaultCategory(), blog2, user1); - WeblogEntry entry5 = TestUtils.setupWeblogEntry("entry5", - testWeblog.getDefaultCategory(), blog2, user1); + WeblogEntry entry1 = TestUtils.setupWeblogEntry("entry1", blog1, user1); + WeblogEntry entry2 = TestUtils.setupWeblogEntry("entry2", blog1, user1); + + WeblogEntry entry3 = TestUtils.setupWeblogEntry("entry3", blog2, user1); + WeblogEntry entry4 = TestUtils.setupWeblogEntry("entry4", blog2, user1); + WeblogEntry entry5 = TestUtils.setupWeblogEntry("entry5", blog2, user1); WeblogEntryComment comment1 = TestUtils.setupComment("comment1", entry1); WeblogEntryComment comment2 = TestUtils.setupComment("comment2", entry1);
Modified: roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/business/WeblogStatsTest.java URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/business/WeblogStatsTest.java?rev=1588757&r1=1588756&r2=1588757&view=diff ============================================================================== --- roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/business/WeblogStatsTest.java (original) +++ roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/business/WeblogStatsTest.java Sun Apr 20 13:38:51 2014 @@ -3,6 +3,7 @@ package org.apache.roller.weblogger.busi import java.util.List; import java.util.Map; import junit.framework.TestCase; +import org.apache.roller.util.RollerConstants; import org.apache.roller.weblogger.TestUtils; import org.apache.roller.weblogger.pojos.WeblogEntryComment; import org.apache.roller.weblogger.pojos.StatCount; @@ -50,7 +51,7 @@ public class WeblogStatsTest extends Tes comment21 = TestUtils.setupComment("Comment21", entry21); TestUtils.endSession(true); - Thread.sleep(1000); + Thread.sleep(RollerConstants.SEC_IN_MS); } public void testGetMostCommentedWeblogs() throws Exception { WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager(); Propchange: roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/ui/ ------------------------------------------------------------------------------ Merged /roller/trunk/app/src/test/java/org/apache/roller/weblogger/ui:r1546818-1588713 Modified: roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/ui/ApplicationResourcesTest.java URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/ui/ApplicationResourcesTest.java?rev=1588757&r1=1588756&r2=1588757&view=diff ============================================================================== --- roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/ui/ApplicationResourcesTest.java (original) +++ roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/ui/ApplicationResourcesTest.java Sun Apr 20 13:38:51 2014 @@ -23,7 +23,6 @@ package org.apache.roller.weblogger.ui; import java.io.FileInputStream; -import java.util.Iterator; import java.util.Properties; import java.util.Set; @@ -54,7 +53,7 @@ public class ApplicationResourcesTest ex private Properties baseProps = null; /** - * @param arg0 + * @param name */ public ApplicationResourcesTest(String name) { @@ -129,16 +128,13 @@ public class ApplicationResourcesTest ex verifyResourceBundle("ApplicationResources_vi"); } - public void testSystemProperties() - { - Properties sysProps = System.getProperties(); - Set keys = sysProps.keySet(); - for (Iterator iter = keys.iterator(); iter.hasNext();) - { - String key = (String) iter.next(); - System.out.println(key + " = " + sysProps.getProperty(key)); - } - } + public void testSystemProperties() + { + Properties sysProps = System.getProperties(); + for (Object key : sysProps.keySet()) { + System.out.println(key + " = " + sysProps.getProperty((String)key)); + } + } /** * Helper method to do the actual testing. @@ -166,15 +162,13 @@ public class ApplicationResourcesTest ex // check Chinese System.out.println("Veriyfing " + bundle + "..."); - for (Iterator iter = keys.iterator(); iter.hasNext();) - { - String key = (String) iter.next(); - if (props.getProperty(key) == null) - { - System.err.println(key + " = " + baseProps.getProperty(key)); - missingMessage = true; - } - } + for (Object key : baseProps.keySet()) { + if (props.getProperty((String) key) == null) + { + System.err.println(key + " = " + baseProps.getProperty((String) key)); + missingMessage = true; + } + } assertFalse(missingMessage); } Modified: roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/ui/rendering/util/CommentValidatorTest.java URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/ui/rendering/util/CommentValidatorTest.java?rev=1588757&r1=1588756&r2=1588757&view=diff ============================================================================== --- roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/ui/rendering/util/CommentValidatorTest.java (original) +++ roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/ui/rendering/util/CommentValidatorTest.java Sun Apr 20 13:38:51 2014 @@ -107,7 +107,7 @@ public class CommentValidatorTest extend comment.setContent("nice friendly stuff"); assertEquals(100, mgr.validateComment(comment, msgs)); - comment.setContent("blah blah 01-suonerie.com blah"); + comment.setContent("blah blah www.myblacklistedsite.com blah"); assertTrue(mgr.validateComment(comment, msgs) != 100); } Modified: roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/util/BlacklistTest.java URL: http://svn.apache.org/viewvc/roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/util/BlacklistTest.java?rev=1588757&r1=1588756&r2=1588757&view=diff ============================================================================== --- roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/util/BlacklistTest.java (original) +++ roller/branches/rome2/app/src/test/java/org/apache/roller/weblogger/util/BlacklistTest.java Sun Apr 20 13:38:51 2014 @@ -72,7 +72,7 @@ public class BlacklistTest extends TestC // test non-regex public void testIsBlacklisted1() { - assertTrue(blacklist.isBlacklisted("00000-online-casino.com")); + assertTrue(blacklist.isBlacklisted("www.myblacklistedsite.com")); } // test the regex patterns @@ -82,34 +82,19 @@ public class BlacklistTest extends TestC // test the regex patterns public void testIsBlacklisted3() { - assertTrue(blacklist.isBlacklisted("www.lsotr.com")); - } - - // test the regex patterns - public void testIsBlacklisted4() { - assertTrue(blacklist.isBlacklisted("blow-job.com")); - } - - // test the regex patterns - public void testIsBlacklisted5() { assertTrue(blacklist.isBlacklisted("buymoreonline.com")); } // test the regex patterns - public void testIsBlacklisted6() { + public void testIsBlacklisted4() { assertTrue(blacklist.isBlacklisted("diet-enlargement.com")); } // test the regex patterns - public void testIsBlacklisted7() { + public void testIsBlacklisted5() { assertTrue(blacklist.isBlacklisted("viagra.com")); } - // test the regex patterns - public void testIsBlacklisted8() { - assertTrue(blacklist.isBlacklisted("ragazze-something.com")); - } - public static Test suite() { return new TestSuite(BlacklistTest.class); }
