You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@roller.apache.org by sn...@apache.org on 2006/02/14 17:30:56 UTC
svn commit: r377759 - in /incubator/roller/trunk/tests/org/roller:
RollerTestBase.java business/FileManagerTest.java
business/PermissionsTest.java business/UserManagerTest.java
business/WeblogManagerTest.java presentation/velocity/ExportRssTest.java
Author: snoopdave
Date: Tue Feb 14 08:30:56 2006
New Revision: 377759
URL: http://svn.apache.org/viewcvs?rev=377759&view=rev
Log:
Unit test fixes
Modified:
incubator/roller/trunk/tests/org/roller/RollerTestBase.java
incubator/roller/trunk/tests/org/roller/business/FileManagerTest.java
incubator/roller/trunk/tests/org/roller/business/PermissionsTest.java
incubator/roller/trunk/tests/org/roller/business/UserManagerTest.java
incubator/roller/trunk/tests/org/roller/business/WeblogManagerTest.java
incubator/roller/trunk/tests/org/roller/presentation/velocity/ExportRssTest.java
Modified: incubator/roller/trunk/tests/org/roller/RollerTestBase.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/tests/org/roller/RollerTestBase.java?rev=377759&r1=377758&r2=377759&view=diff
==============================================================================
--- incubator/roller/trunk/tests/org/roller/RollerTestBase.java (original)
+++ incubator/roller/trunk/tests/org/roller/RollerTestBase.java Tue Feb 14 08:30:56 2006
@@ -118,7 +118,7 @@
"TestUser",
"testuser@example.com");
UserManager umgr = getRoller().getUserManager();
- mWebsite = (WebsiteData)umgr.getWebsites(mUser, null).get(0);
+ mWebsite = (WebsiteData)umgr.getWebsites(mUser, null, null).get(0);
getRoller().commit();
getRoller().begin(UserData.SYSTEM_USER);
@@ -197,7 +197,7 @@
"test"+i+"@test.com" // emailAddress
);
ud.setEnabled(new Boolean(i%2 == 0)); // half of users are disabled
- WebsiteData website = (WebsiteData)umgr.getWebsites(ud, null).get(0);
+ WebsiteData website = (WebsiteData)umgr.getWebsites(ud, null, null).get(0);
mWebsitesCreated.add(website);
mUsersCreated.add(ud);
@@ -378,7 +378,7 @@
UserData user = umgr.getUser(deleteMe);
- WebsiteData website = (WebsiteData)umgr.getWebsites(user, null).get(0);
+ WebsiteData website = (WebsiteData)umgr.getWebsites(user, null, null).get(0);
website.remove();
user.remove();
Modified: incubator/roller/trunk/tests/org/roller/business/FileManagerTest.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/tests/org/roller/business/FileManagerTest.java?rev=377759&r1=377758&r2=377759&view=diff
==============================================================================
--- incubator/roller/trunk/tests/org/roller/business/FileManagerTest.java (original)
+++ incubator/roller/trunk/tests/org/roller/business/FileManagerTest.java Tue Feb 14 08:30:56 2006
@@ -45,7 +45,7 @@
UserManager umgr = mRoller.getUserManager();
UserData user = umgr.getUser("FileManagerTest_userName");
- WebsiteData mWebsite = (WebsiteData)umgr.getWebsites(user,null).get(0);
+ WebsiteData mWebsite = (WebsiteData)umgr.getWebsites(user,null, null).get(0);
if(mWebsite == null)
mWebsite = this.createTestUser();
@@ -78,7 +78,7 @@
Roller roller = RollerFactory.getRoller();
UserManager umgr = roller.getUserManager();
UserData user = umgr.getUser("FileManagerTest_userName");
- WebsiteData mWebsite = (WebsiteData)umgr.getWebsites(user,null).get(0);
+ WebsiteData mWebsite = (WebsiteData)umgr.getWebsites(user,null, null).get(0);
if(mWebsite == null)
mWebsite = this.createTestUser();
@@ -132,7 +132,7 @@
user.getUserName(), user.getUserName(), user.getUserName(),
"dummy@example.com","basic", "en_US_WIN", "America/Los_Angeles");
mRoller.commit();
- WebsiteData website = (WebsiteData)umgr.getWebsites(user,null).get(0);
+ WebsiteData website = (WebsiteData)umgr.getWebsites(user,null, null).get(0);
return website;
}
Modified: incubator/roller/trunk/tests/org/roller/business/PermissionsTest.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/tests/org/roller/business/PermissionsTest.java?rev=377759&r1=377758&r2=377759&view=diff
==============================================================================
--- incubator/roller/trunk/tests/org/roller/business/PermissionsTest.java (original)
+++ incubator/roller/trunk/tests/org/roller/business/PermissionsTest.java Tue Feb 14 08:30:56 2006
@@ -60,14 +60,15 @@
// gets hold of goodguy's entry
UserData goodguy = umgr.getUser("testuser2");
- WebsiteData website0 = (WebsiteData)umgr.getWebsites(goodguy, null).get(0);
+ WebsiteData website0 = (WebsiteData)umgr.getWebsites(goodguy, null, null).get(0);
assertNotNull(website0);
List entries = getRoller().getWeblogManager().getWeblogEntries(
website0,
null, // start
new Date(), // end
null, // cat
- null,
+ null, // status
+ null, // sortby
new Integer(1));
WeblogEntryData entry = (WeblogEntryData)entries.get(0);
assertNotNull(entry);
@@ -99,7 +100,7 @@
// gets hold of testuser0's entry
UserData testuser0 = umgr.getUser("testuser2");
- WebsiteData website0 = (WebsiteData)umgr.getWebsites(testuser0, null).get(0);
+ WebsiteData website0 = (WebsiteData)umgr.getWebsites(testuser0, null, null).get(0);
assertNotNull(website0);
FolderData root = getRoller().getBookmarkManager().getRootFolder(website0);
BookmarkData bookmark = (BookmarkData)root.getBookmarks().iterator().next();
@@ -231,7 +232,7 @@
assertFalse(umgr.getPermissions(tsite, tuser).isPending());
// assert that user has website
- List websites = umgr.getWebsites(tuser, null);
+ List websites = umgr.getWebsites(tuser, null, null);
assertEquals( tsite.getId(),
((WebsiteData)websites.get(0)).getId());
@@ -254,7 +255,7 @@
{
tuser = umgr.retrieveUser(tuser.getId());
tsite = umgr.retrieveWebsite(tsite.getId());
- List websites = umgr.getWebsites(tuser, null);
+ List websites = umgr.getWebsites(tuser, null, null);
assertEquals(0, websites.size());
List users = umgr.getUsers(tsite, null);
assertEquals(0, users.size());
Modified: incubator/roller/trunk/tests/org/roller/business/UserManagerTest.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/tests/org/roller/business/UserManagerTest.java?rev=377759&r1=377758&r2=377759&view=diff
==============================================================================
--- incubator/roller/trunk/tests/org/roller/business/UserManagerTest.java (original)
+++ incubator/roller/trunk/tests/org/roller/business/UserManagerTest.java Tue Feb 14 08:30:56 2006
@@ -76,7 +76,7 @@
"EnabledUser",
"enabledUser@example.com");
enabledUser.setEnabled(Boolean.TRUE);
- enabledSite = ((WebsiteData)umgr.getWebsites(enabledUser, null).get(0));
+ enabledSite = ((WebsiteData)umgr.getWebsites(enabledUser, null, null).get(0));
enabledSite.setEnabled(Boolean.TRUE);
disabledUser = createUser(disabledUserName,
@@ -85,7 +85,7 @@
"disabledUser@example.com");
disabledUser.setEnabled(Boolean.FALSE);
- disabledSite = ((WebsiteData)umgr.getWebsites(disabledUser, null).get(0));
+ disabledSite = ((WebsiteData)umgr.getWebsites(disabledUser, null, null).get(0));
disabledSite.setEnabled(Boolean.FALSE);
getRoller().commit();
@@ -251,7 +251,7 @@
UserData user1 = umgr.retrieveUser(user.getId());
assertNotNull(user1);
- WebsiteData website = (WebsiteData)umgr.getWebsites(user, null).get(0);
+ WebsiteData website = (WebsiteData)umgr.getWebsites(user, null, null).get(0);
assertNotNull(website);
FolderData root = getRoller().getBookmarkManager().getRootFolder(website);
@@ -288,16 +288,16 @@
// can get testuser0 who is enabled
assertTrue(umgr.getWebsites(
- umgr.getUser(enabledUserName), Boolean.TRUE).size() > 0);
+ umgr.getUser(enabledUserName), Boolean.TRUE, null).size() > 0);
// can't get testuser1, who is disabled
disabledUser = umgr.retrieveUser(disabledUser.getId());
assertTrue(umgr.getWebsites(
- disabledUser, Boolean.TRUE).size() == 0);
+ disabledUser, Boolean.TRUE, null).size() == 0);
// can get testuser1 with enabledOnly flag set to false
assertTrue(umgr.getWebsites(
- umgr.getUser(disabledUserName), Boolean.FALSE).size() == 1);
+ umgr.getUser(disabledUserName), Boolean.FALSE, null).size() == 1);
}
public void testGetUser() throws RollerException
@@ -374,7 +374,7 @@
{
UserManager umgr = getRoller().getUserManager();
WebsiteData wd0 = (WebsiteData)umgr.getWebsites(
- umgr.getUser(enabledUserName), null).get(0);
+ umgr.getUser(enabledUserName), null, null).get(0);
assertNotNull(wd0.getPageByName("Weblog"));
}
@@ -383,7 +383,7 @@
{
UserManager umgr = getRoller().getUserManager();
WebsiteData wd0 = (WebsiteData)umgr.getWebsites(
- umgr.getUser(enabledUserName), null).get(0);
+ umgr.getUser(enabledUserName), null, null).get(0);
assertNotNull(wd0.getPageByLink("Weblog"));
}
@@ -391,7 +391,7 @@
{
UserManager umgr = getRoller().getUserManager();
WebsiteData wd0 = (WebsiteData)umgr.getWebsites(
- umgr.getUser(enabledUserName), null).get(0);
+ umgr.getUser(enabledUserName), null, null).get(0);
assertEquals(5, wd0.getPages().size());
}
Modified: incubator/roller/trunk/tests/org/roller/business/WeblogManagerTest.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/tests/org/roller/business/WeblogManagerTest.java?rev=377759&r1=377758&r2=377759&view=diff
==============================================================================
--- incubator/roller/trunk/tests/org/roller/business/WeblogManagerTest.java (original)
+++ incubator/roller/trunk/tests/org/roller/business/WeblogManagerTest.java Tue Feb 14 08:30:56 2006
@@ -213,11 +213,12 @@
List entries = wmgr.getWeblogEntries(
wd,
- null, // startDate
- new Date(), // endDate
- "toplevel1", // catName
- null, // status
- new Integer(15)); // maxEntries
+ null, // startDate
+ new Date(), // endDate
+ "toplevel1", // catName
+ null, // status
+ null, // sortby
+ new Integer(15)); // maxEntries
assertEquals(4, entries.size());
@@ -673,12 +674,13 @@
// PUBLISHISHED ONLY
List publishedEntries = wmgr.getWeblogEntries(
- website, // userName
- null, // startDate
- new Date(), // endDate
- null, // catName
+ website, // userName
+ null, // startDate
+ new Date(), // endDate
+ null, // catName
WeblogEntryData.PUBLISHED, // status
- null); // maxEntries
+ null, // sortby
+ null); // maxEntries
assertEquals(mExpectedPublishedEntryCount, publishedEntries.size());
// DRAFT ONLY
@@ -687,7 +689,8 @@
null, // startDate
new Date(), // endDate
null, // catName
- WeblogEntryData.DRAFT, // status
+ WeblogEntryData.DRAFT, // status
+ null, // sortby
null); // maxEntries
assertEquals(mExpectedEntryCount-mExpectedPublishedEntryCount, draftEntries.size());
@@ -697,7 +700,8 @@
null, // startDate
new Date(), // endDate
null, // catName
- null, // status
+ null, // status
+ null, // sortby
null); // maxEntries
assertEquals(mExpectedEntryCount, allEntries.size());
@@ -708,6 +712,7 @@
new Date(), // endDate
null, // catName
null, // status
+ null, // sortby
null); // maxEntries
assertEquals(mExpectedEntryCount, allEntries2.size());
@@ -803,14 +808,15 @@
// gets hold of testuser0's entry
WebsiteData website0 = (WebsiteData)umgr.getWebsites(
- umgr.getUser("testuser2"), null).get(0);
+ umgr.getUser("testuser2"), null, null).get(0);
assertNotNull(website0);
List entries = getRoller().getWeblogManager().getWeblogEntries(
website0,
null, // start
new Date(), // end
null, // cat
- null,
+ null, // status
+ null, // sortby
new Integer(1));
WeblogEntryData entry = (WeblogEntryData)entries.get(0);
assertNotNull(entry);
Modified: incubator/roller/trunk/tests/org/roller/presentation/velocity/ExportRssTest.java
URL: http://svn.apache.org/viewcvs/incubator/roller/trunk/tests/org/roller/presentation/velocity/ExportRssTest.java?rev=377759&r1=377758&r2=377759&view=diff
==============================================================================
--- incubator/roller/trunk/tests/org/roller/presentation/velocity/ExportRssTest.java (original)
+++ incubator/roller/trunk/tests/org/roller/presentation/velocity/ExportRssTest.java Tue Feb 14 08:30:56 2006
@@ -45,8 +45,9 @@
null, // startDate
new Date(), // endDate
null, // catName
- null, // status
- new Integer(5)); // maxEntries
+ null, // status
+ null, // sortby
+ new Integer(5)); // maxEntries
try
{