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 2007/11/26 16:52:16 UTC
svn commit: r598319 [10/12] - in /roller/trunk: ./ apps/planet/
apps/planet/testdata/ apps/weblogger/ apps/weblogger/custom/
apps/weblogger/nbproject/ apps/weblogger/src/java/META-INF/
apps/weblogger/src/java/org/apache/roller/weblogger/business/ apps/...
Modified: roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/FolderFunctionalityTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/FolderFunctionalityTest.java?rev=598319&r1=598318&r2=598319&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/FolderFunctionalityTest.java (original)
+++ roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/FolderFunctionalityTest.java Mon Nov 26 07:51:43 2007
@@ -82,7 +82,7 @@
try {
TestUtils.teardownWeblog(testWeblog.getId());
- TestUtils.teardownUser(testUser.getId());
+ TestUtils.teardownUser(testUser.getUserName());
TestUtils.endSession(true);
} catch (Exception ex) {
log.error(ex);
Modified: roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/FolderParentDeletesTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/FolderParentDeletesTest.java?rev=598319&r1=598318&r2=598319&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/FolderParentDeletesTest.java (original)
+++ roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/FolderParentDeletesTest.java Mon Nov 26 07:51:43 2007
@@ -68,7 +68,7 @@
log.info("BEGIN");
try {
- TestUtils.teardownUser(testUser.getId());
+ TestUtils.teardownUser(testUser.getUserName());
TestUtils.endSession(true);
} catch (Exception ex) {
log.error(ex);
@@ -103,8 +103,7 @@
// now delete the weblog owning these categories
Exception ex = null;
try {
- UserManager umgr = WebloggerFactory.getWeblogger().getUserManager();
- umgr.removeWebsite(TestUtils.getManagedWebsite(testWeblog));
+ WebloggerFactory.getWeblogger().getWeblogManager().removeWeblog(TestUtils.getManagedWebsite(testWeblog));
TestUtils.endSession(true);
} catch (WebloggerException e) {
ex = e;
Modified: roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/HitCountTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/HitCountTest.java?rev=598319&r1=598318&r2=598319&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/HitCountTest.java (original)
+++ roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/HitCountTest.java Mon Nov 26 07:51:43 2007
@@ -27,7 +27,7 @@
import org.apache.commons.logging.LogFactory;
import org.apache.roller.weblogger.TestUtils;
import org.apache.roller.weblogger.business.WebloggerFactory;
-import org.apache.roller.weblogger.business.WeblogManager;
+import org.apache.roller.weblogger.business.WeblogEntryManager;
import org.apache.roller.weblogger.pojos.WeblogHitCount;
import org.apache.roller.weblogger.pojos.User;
import org.apache.roller.weblogger.pojos.Weblog;
@@ -76,7 +76,7 @@
try {
TestUtils.teardownWeblog(testWeblog.getId());
- TestUtils.teardownUser(testUser.getId());
+ TestUtils.teardownUser(testUser.getUserName());
TestUtils.endSession(true);
} catch (Exception ex) {
log.error(ex);
@@ -90,7 +90,7 @@
*/
public void testHitCountCRUD() throws Exception {
- WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
+ WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager();
WeblogHitCount testCount = new WeblogHitCount();
testCount.setWeblog(testWeblog);
@@ -133,7 +133,7 @@
public void testHitCountLookups() throws Exception {
- WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
+ WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager();
testWeblog = TestUtils.getManagedWebsite(testWeblog);
WeblogHitCount testCount = new WeblogHitCount();
@@ -173,7 +173,7 @@
public void testIncrementHitCount() throws Exception {
- WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
+ WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager();
WeblogHitCount testCount = new WeblogHitCount();
testWeblog = TestUtils.getManagedWebsite(testWeblog);
@@ -215,7 +215,7 @@
public void testResetHitCounts() throws Exception {
- WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
+ WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager();
testUser = TestUtils.getManagedUser(testUser);
Weblog blog1 = TestUtils.setupWeblog("hitCntTest1", testUser);
@@ -277,7 +277,7 @@
public void testHotWeblogs() throws Exception {
- WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
+ WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager();
testUser = TestUtils.getManagedUser(testUser);
Weblog blog1 = TestUtils.setupWeblog("hitCntHotTest1", testUser);
Modified: roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/IndexManagerTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/IndexManagerTest.java?rev=598319&r1=598318&r2=598319&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/IndexManagerTest.java (original)
+++ roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/IndexManagerTest.java Mon Nov 26 07:51:43 2007
@@ -57,7 +57,7 @@
WeblogEntry wd1 = new WeblogEntry();
wd1.setId("dummy1");
wd1.setAnchor("dummy1");
- wd1.setCreator(user);
+ wd1.setCreatorUserName(user.getUserName());
wd1.setUpdateTime(new Timestamp(System.currentTimeMillis()));
wd1.setPubTime(new Timestamp(System.currentTimeMillis()));
wd1.setTitle("The Tholian Web");
@@ -72,7 +72,7 @@
WeblogEntry wd2 = new WeblogEntry();
wd2.setId("dummy2");
wd2.setAnchor("dummy2");
- wd2.setCreator(user);
+ wd2.setCreatorUserName(user.getUserName());
wd2.setUpdateTime(new Timestamp(System.currentTimeMillis()));
wd2.setPubTime(new Timestamp(System.currentTimeMillis()));
wd2.setTitle("A Piece of the Action");
Modified: roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/PermissionTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/PermissionTest.java?rev=598319&r1=598318&r2=598319&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/PermissionTest.java (original)
+++ roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/PermissionTest.java Mon Nov 26 07:51:43 2007
@@ -17,6 +17,8 @@
*/
package org.apache.roller.weblogger.business;
+import java.util.ArrayList;
+import java.util.Collections;
import java.util.List;
import junit.framework.Test;
import junit.framework.TestCase;
@@ -26,9 +28,9 @@
import org.apache.roller.weblogger.TestUtils;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.UserManager;
-import org.apache.roller.weblogger.pojos.WeblogPermission;
import org.apache.roller.weblogger.pojos.User;
import org.apache.roller.weblogger.pojos.Weblog;
+import org.apache.roller.weblogger.pojos.WeblogPermission;
/**
@@ -67,7 +69,7 @@
testWeblog = TestUtils.setupWeblog("permsTestWeblog", testUser);
TestUtils.endSession(true);
} catch (Exception ex) {
- log.error(ex);
+ log.error("ERROR in setup", ex);
throw new Exception("Test setup failed", ex);
}
@@ -80,10 +82,10 @@
try {
TestUtils.teardownWeblog(testWeblog.getId());
- TestUtils.teardownUser(testUser.getId());
+ TestUtils.teardownUser(testUser.getUserName());
TestUtils.endSession(true);
} catch (Exception ex) {
- log.error(ex);
+ log.error("ERROR in tear down", ex);
throw new Exception("Test teardown failed", ex);
}
@@ -99,55 +101,74 @@
log.info("BEGIN");
UserManager mgr = WebloggerFactory.getWeblogger().getUserManager();
+
+ WeblogPermission p1 = new WeblogPermission(testWeblog, testUser,
+ WeblogPermission.ADMIN + "," + WeblogPermission.POST);
+ assertTrue(p1.hasAction(WeblogPermission.POST));
+ assertTrue(p1.hasAction(WeblogPermission.ADMIN));
+ assertEquals(2, p1.getActionsAsList().size());
+
+ WeblogPermission p2 = new WeblogPermission(testWeblog, testUser,
+ WeblogPermission.EDIT_DRAFT);
+ p1.addActions(p2);
+ assertEquals(3, p1.getActionsAsList().size());
+
+
WeblogPermission perm = null;
-
+
// delete permissions
testWeblog = TestUtils.getManagedWebsite(testWeblog);
testUser = TestUtils.getManagedUser(testUser);
- perm = mgr.getPermissions(testWeblog, testUser);
+ perm = mgr.getWeblogPermission(testWeblog, testUser);
assertNotNull(perm);
- mgr.removePermissions(perm);
+ mgr.revokeWeblogPermission(testWeblog, testUser, WeblogPermission.ALL_ACTIONS);
TestUtils.endSession(true);
// check that delete was successful
perm = null;
testWeblog = TestUtils.getManagedWebsite(testWeblog);
testUser = TestUtils.getManagedUser(testUser);
- perm = mgr.getPermissions(testWeblog, testUser);
+ perm = mgr.getWeblogPermission(testWeblog, testUser);
assertNull(perm);
// create permissions
- perm = new WeblogPermission();
- perm.setUser(testUser);
- perm.setWebsite(testWeblog);
- perm.setPending(false);
- perm.setPermissionMask(WeblogPermission.ADMIN);
- mgr.savePermissions(perm);
+ List<String> actions = new ArrayList<String>();
+ actions.add(WeblogPermission.ADMIN);
+ actions.add(WeblogPermission.POST);
+ mgr.grantWeblogPermission(testWeblog, testUser, actions);
TestUtils.endSession(true);
// check that create was successful
testWeblog = TestUtils.getManagedWebsite(testWeblog);
testUser = TestUtils.getManagedUser(testUser);
perm = null;
- perm = mgr.getPermissions(testWeblog, testUser);
+ perm = mgr.getWeblogPermission(testWeblog, testUser);
assertNotNull(perm);
- assertEquals(WeblogPermission.ADMIN, perm.getPermissionMask());
+ assertTrue(perm.hasAction(WeblogPermission.POST));
+ assertTrue(perm.hasAction(WeblogPermission.ADMIN));
+ TestUtils.endSession(true);
- // update permissions
- perm.setPermissionMask(WeblogPermission.LIMITED);
- mgr.savePermissions(perm);
+ // revoke those same permissions
+ mgr.revokeWeblogPermission(perm.getWeblog(), perm.getUser(), WeblogPermission.ALL_ACTIONS);
+ TestUtils.endSession(true);
+
+ // add only draft permission
+ mgr.grantWeblogPermission(testWeblog, testUser,
+ Collections.singletonList(WeblogPermission.EDIT_DRAFT));
TestUtils.endSession(true);
- // check that update was successful
+ // check that user has draft permisson only
testWeblog = TestUtils.getManagedWebsite(testWeblog);
testUser = TestUtils.getManagedUser(testUser);
perm = null;
- perm = mgr.getPermissions(testWeblog, testUser);
+ perm = mgr.getWeblogPermission(testWeblog, testUser);
assertNotNull(perm);
- assertEquals(WeblogPermission.LIMITED, perm.getPermissionMask());
+ assertTrue(perm.hasAction(WeblogPermission.EDIT_DRAFT));
+ assertFalse(perm.hasAction(WeblogPermission.POST));
+ assertFalse(perm.hasAction(WeblogPermission.ADMIN));
log.info("END");
- }
+ }
/**
@@ -157,69 +178,60 @@
log.info("BEGIN");
- try {
- // we need a second user for this test
- User user = TestUtils.setupUser("testPermissionsLookups");
- TestUtils.endSession(true);
-
- UserManager mgr = WebloggerFactory.getWeblogger().getUserManager();
- WeblogPermission perm = null;
- List perms = null;
-
- // get all permissions for a user
- perms = mgr.getAllPermissions(TestUtils.getManagedUser(user));
- assertEquals(0, perms.size());
- perms = mgr.getAllPermissions(TestUtils.getManagedUser(testUser));
- assertEquals(1, perms.size());
-
- // get all permissions for a weblog
- perms = mgr.getAllPermissions(TestUtils.getManagedWebsite(testWeblog));
- assertEquals(1, perms.size());
-
- perm = new WeblogPermission();
- perm.setUser(TestUtils.getManagedUser(user));
- perm.setWebsite(TestUtils.getManagedWebsite(testWeblog));
- perm.setPending(true);
- perm.setPermissionMask(WeblogPermission.AUTHOR);
- mgr.savePermissions(perm);
- TestUtils.endSession(true);
-
- // get pending permissions for a user
- perms = mgr.getPendingPermissions(TestUtils.getManagedUser(testUser));
- assertEquals(0, perms.size());
- perms = mgr.getPendingPermissions(TestUtils.getManagedUser(user));
- assertEquals(1, perms.size());
-
- // get pending permissions for a weblog
- perms = mgr.getPendingPermissions(TestUtils.getManagedWebsite(testWeblog));
- assertEquals(1, perms.size());
-
- // get permissions by id
- String id = perm.getId();
- perm = null;
- perm = mgr.getPermissions(id);
- assertNotNull(perm);
- assertEquals(id, perm.getId());
-
- // get permissions for a specific user/weblog
- perm = null;
- perm = mgr.getPermissions(TestUtils.getManagedWebsite(testWeblog), TestUtils.getManagedUser(testUser));
- assertNotNull(perm);
- assertEquals(WeblogPermission.ADMIN, perm.getPermissionMask());
- perm = null;
- perm = mgr.getPermissions(TestUtils.getManagedWebsite(testWeblog), TestUtils.getManagedUser(user));
- assertNotNull(perm);
- assertEquals(WeblogPermission.AUTHOR, perm.getPermissionMask());
- assertEquals(true, perm.isPending());
-
- // cleanup
- TestUtils.teardownPermissions(perm.getId());
- TestUtils.teardownUser(user.getId());
- TestUtils.endSession(true);
- } catch(Throwable t) {
- log.error("Error running test", t);
- throw (Exception) t;
- }
+ // we need a second user for this test
+ User user = TestUtils.setupUser("testPermissionsLookups");
+ TestUtils.endSession(true);
+
+ UserManager mgr = WebloggerFactory.getWeblogger().getUserManager();
+ WeblogPermission perm = null;
+ List<WeblogPermission> perms = null;
+
+ // get all permissions for a user
+ perms = mgr.getWeblogPermissions(TestUtils.getManagedUser(user));
+ assertEquals(0, perms.size());
+ perms = mgr.getWeblogPermissions(TestUtils.getManagedUser(testUser));
+ assertEquals(1, perms.size());
+
+ // get all permissions for a weblog
+ perms = mgr.getWeblogPermissions(TestUtils.getManagedWebsite(testWeblog));
+ assertEquals(1, perms.size());
+
+ List<String> actions = new ArrayList<String>();
+ actions.add(WeblogPermission.POST);
+ mgr.grantWeblogPermissionPending(testWeblog, user, actions);
+ TestUtils.endSession(true);
+
+ // get pending permissions for a user
+ perms = mgr.getWeblogPermissionsPending(TestUtils.getManagedUser(testUser));
+ assertEquals(0, perms.size());
+ perms = mgr.getWeblogPermissionsPending(TestUtils.getManagedUser(user));
+ assertEquals(1, perms.size());
+
+ // get pending permissions for a weblog
+ perms = mgr.getWeblogPermissionsPending(TestUtils.getManagedWebsite(testWeblog));
+ assertEquals(1, perms.size());
+
+ // get permissions for a specific user/weblog
+ perm = null;
+ perm = mgr.getWeblogPermission(
+ TestUtils.getManagedWebsite(testWeblog),
+ TestUtils.getManagedUser(testUser));
+ assertNotNull(perm);
+ assertTrue(perm.hasAction(WeblogPermission.ADMIN));
+
+ // pending permissions should not be visible
+ perm = null;
+ perm = mgr.getWeblogPermission(
+ TestUtils.getManagedWebsite(testWeblog),
+ TestUtils.getManagedUser(user));
+ assertNull(perm);
+
+ List<WeblogPermission> pendings = mgr.getWeblogPermissionsPending(user);
+
+ // cleanup
+ TestUtils.teardownPermissions(pendings.get(0));
+ TestUtils.teardownUser(user.getUserName());
+ TestUtils.endSession(true);
log.info("END");
}
@@ -236,56 +248,79 @@
User user = TestUtils.setupUser("testInvitations");
TestUtils.endSession(true);
- UserManager mgr = WebloggerFactory.getWeblogger().getUserManager();
+ WeblogManager wmgr = WebloggerFactory.getWeblogger().getWeblogManager();
+ UserManager umgr = WebloggerFactory.getWeblogger().getUserManager();
WeblogPermission perm = null;
List perms = null;
// invite user to weblog
- perm = mgr.inviteUser(TestUtils.getManagedWebsite(testWeblog), user, WeblogPermission.LIMITED);
- String id = perm.getId();
+ List<String> actions = new ArrayList<String>();
+ actions.add(WeblogPermission.EDIT_DRAFT);
+ umgr.grantWeblogPermissionPending(testWeblog, user, actions);
TestUtils.endSession(true);
// accept invitation
- testWeblog = TestUtils.getManagedWebsite(testWeblog);
- user = TestUtils.getManagedUser(user);
- perm = mgr.getPermissions(testWeblog, user);
- perm.setPending(false);
- mgr.savePermissions(perm);
+ umgr.confirmWeblogPermission(testWeblog, user);
TestUtils.endSession(true);
// re-query now that we have changed things
- user = mgr.getUserByUserName(user.getUserName());
- testWeblog = mgr.getWebsiteByHandle(testWeblog.getHandle());
+ user = umgr.getUserByUserName(user.getUserName());
+ testWeblog = wmgr.getWeblogByHandle(testWeblog.getHandle());
// assert that invitation list is empty
testWeblog = TestUtils.getManagedWebsite(testWeblog);
user = TestUtils.getManagedUser(user);
- assertTrue(mgr.getPendingPermissions(user).isEmpty());
- assertTrue(mgr.getPendingPermissions(testWeblog).isEmpty());
+ assertTrue(umgr.getWeblogPermissionsPending(user).isEmpty());
+ assertTrue(umgr.getWeblogPermissionsPending(testWeblog).isEmpty());
// assert that user is member of weblog
- assertFalse(mgr.getPermissions(testWeblog, user).isPending());
- List weblogs = mgr.getWebsites(TestUtils.getManagedUser(user), null, null, null, null, 0, -1);
+ assertNotNull(umgr.getWeblogPermission(testWeblog, user));
+ List weblogs = wmgr.getUserWeblogs(TestUtils.getManagedUser(user), true);
assertEquals(1, weblogs.size());
assertEquals(testWeblog.getId(), ((Weblog)weblogs.get(0)).getId());
// assert that website has user
- List users = mgr.getUsers(testWeblog, null, null, null, 0, -1);
+ List users = wmgr.getWeblogUsers(testWeblog, true);
assertEquals(2, users.size());
// test user can be retired from website
- mgr.retireUser(testWeblog, user);
+ umgr.revokeWeblogPermission(testWeblog, user, WeblogPermission.ALL_ACTIONS);
TestUtils.endSession(true);
- user = mgr.getUser(user.getId());
- weblogs = mgr.getWebsites(user, null, null, null, null, 0, -1);
+ //user = umgr.getUser(user.getId());
+ weblogs = wmgr.getUserWeblogs(user, true);
assertEquals(0, weblogs.size());
// cleanup the extra test user
- TestUtils.teardownUser(user.getId());
+ TestUtils.teardownUser(user.getUserName());
TestUtils.endSession(true);
log.info("END");
}
+
+ /**
+ * Tests weblog invitation process.
+ */
+ public void testPermissionChecks() throws Exception {
+
+ log.info("BEGIN");
+
+ WeblogPermission perm =
+ new WeblogPermission(testWeblog, testUser, WeblogPermission.POST);
+ UserManager umgr = WebloggerFactory.getWeblogger().getUserManager();
+ assertTrue(umgr.checkPermission(perm, testUser));
+
+ // we need a second user for this test
+ User adminUser = TestUtils.setupUser("adminUser");
+ umgr.grantRole("admin", adminUser);
+ TestUtils.endSession(true);
+
+ // because adminUser is a global admin, they should have POST perm
+ WeblogPermission perm2 =
+ new WeblogPermission(testWeblog, testUser, WeblogPermission.POST);
+ assertTrue(umgr.checkPermission(perm, testUser));
+
+ log.info("END");
+ }
}
Modified: roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/PingsTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/PingsTest.java?rev=598319&r1=598318&r2=598319&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/PingsTest.java (original)
+++ roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/PingsTest.java Mon Nov 26 07:51:43 2007
@@ -93,7 +93,7 @@
try {
TestUtils.teardownWeblog(testWeblog.getId());
- TestUtils.teardownUser(testUser.getId());
+ TestUtils.teardownUser(testUser.getUserName());
TestUtils.endSession(true);
} catch (Exception ex) {
log.error(ex);
Modified: roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/PlanetManagerLocalTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/PlanetManagerLocalTest.java?rev=598319&r1=598318&r2=598319&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/PlanetManagerLocalTest.java (original)
+++ roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/PlanetManagerLocalTest.java Mon Nov 26 07:51:43 2007
@@ -68,9 +68,9 @@
testEntry1.setPubTime(new Timestamp(new Date().getTime()));
testEntry1.setUpdateTime(new Timestamp(new Date().getTime()));
testEntry1.setWebsite(testWeblog);
- testEntry1.setCreator(testUser);
+ testEntry1.setCreatorUserName(testUser.getUserName());
testEntry1.setCategory(testWeblog.getDefaultCategory());
- WebloggerFactory.getWeblogger().getWeblogManager().saveWeblogEntry(testEntry1);
+ WebloggerFactory.getWeblogger().getWeblogEntryManager().saveWeblogEntry(testEntry1);
WeblogEntry testEntry2 = new WeblogEntry();
testEntry2.setTitle("entryTestEntry2");
@@ -80,9 +80,9 @@
testEntry2.setPubTime(new Timestamp(new Date().getTime()));
testEntry2.setUpdateTime(new Timestamp(new Date().getTime()));
testEntry2.setWebsite(testWeblog);
- testEntry2.setCreator(testUser);
+ testEntry2.setCreatorUserName(testUser.getUserName());
testEntry2.setCategory(testWeblog.getDefaultCategory());
- WebloggerFactory.getWeblogger().getWeblogManager().saveWeblogEntry(testEntry1);
+ WebloggerFactory.getWeblogger().getWeblogEntryManager().saveWeblogEntry(testEntry1);
WeblogEntry testEntry3 = new WeblogEntry();
testEntry3.setTitle("entryTestEntry3");
@@ -92,9 +92,9 @@
testEntry3.setPubTime(new Timestamp(new Date().getTime()));
testEntry3.setUpdateTime(new Timestamp(new Date().getTime()));
testEntry3.setWebsite(testWeblog);
- testEntry3.setCreator(testUser);
+ testEntry3.setCreatorUserName(testUser.getUserName());
testEntry3.setCategory(testWeblog.getDefaultCategory());
- WebloggerFactory.getWeblogger().getWeblogManager().saveWeblogEntry(testEntry1);
+ WebloggerFactory.getWeblogger().getWeblogEntryManager().saveWeblogEntry(testEntry1);
TestUtils.endSession(true);
@@ -108,7 +108,7 @@
try {
TestUtils.teardownWeblog(testWeblog.getId());
- TestUtils.teardownUser(testUser.getId());
+ TestUtils.teardownUser(testUser.getUserName());
TestUtils.endSession(true);
} catch (Exception ex) {
log.error(ex);
Modified: roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/RefererTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/RefererTest.java?rev=598319&r1=598318&r2=598319&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/RefererTest.java (original)
+++ roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/RefererTest.java Mon Nov 26 07:51:43 2007
@@ -121,7 +121,7 @@
TestUtils.teardownWeblog(testWeblog.getId());
TestUtils.teardownWeblog(testWeblog2.getId());
- TestUtils.teardownUser(testUser.getId());
+ TestUtils.teardownUser(testUser.getUserName());
TestUtils.endSession(true);
@@ -252,11 +252,10 @@
assertEquals(count, refs.size());
String origWords = null;
- UserManager umgr = WebloggerFactory.getWeblogger().getUserManager();
testWeblog = TestUtils.getManagedWebsite(testWeblog);
origWords = testWeblog.getBlacklist();
testWeblog.setBlacklist("test");
- umgr.saveWebsite(testWeblog);
+ WebloggerFactory.getWeblogger().getWeblogManager().saveWeblog(testWeblog);
TestUtils.endSession(true);
testWeblog = TestUtils.getManagedWebsite(testWeblog);
Modified: roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/UserTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/UserTest.java?rev=598319&r1=598318&r2=598319&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/UserTest.java (original)
+++ roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/UserTest.java Mon Nov 26 07:51:43 2007
@@ -29,6 +29,7 @@
import org.apache.roller.weblogger.TestUtils;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.UserManager;
+import org.apache.roller.weblogger.config.WebloggerConfig;
import org.apache.roller.weblogger.pojos.User;
@@ -84,12 +85,12 @@
// add test user
mgr.addUser(testUser);
- String id = testUser.getId();
+ String userName = testUser.getUserName();
TestUtils.endSession(true);
// make sure test user exists
user = null;
- user = mgr.getUser(id);
+ user = mgr.getUserByUserName(userName);
assertNotNull(user);
assertEquals(testUser, user);
@@ -101,7 +102,7 @@
// make sure changes were saved
user = null;
- user = mgr.getUser(id);
+ user = mgr.getUserByUserName(userName);
assertNotNull(user);
assertEquals("testtesttest", user.getScreenName());
assertEquals("testtesttest", user.getFullName());
@@ -112,7 +113,7 @@
// make sure user no longer exists
user = null;
- user = mgr.getUser(id);
+ user = mgr.getUserByUserName(userName);
assertNull(user);
}
@@ -135,9 +136,9 @@
assertEquals(testUser.getUserName(), user.getUserName());
// lookup by id
- String id = user.getId();
+ String userName = user.getUserName();
user = null;
- user = mgr.getUser(id);
+ user = mgr.getUserByUserName(userName);
assertNotNull(user);
assertEquals(testUser.getUserName(), user.getUserName());
@@ -166,7 +167,7 @@
assertNull(user);
// remove test user
- TestUtils.teardownUser(testUser.getId());
+ TestUtils.teardownUser(testUser.getUserName());
TestUtils.endSession(true);
}
@@ -183,15 +184,21 @@
User testUser = TestUtils.setupUser("roleTestUser");
TestUtils.endSession(true);
- // verify user has 2 roles, admin & editor
user = mgr.getUserByUserName(testUser.getUserName());
assertNotNull(user);
- assertEquals(2, user.getRoles().size());
- assertTrue(user.hasRole("editor"));
- assertTrue(user.hasRole("admin"));
+
+ if (WebloggerConfig.getBooleanProperty("users.firstUserAdmin")) {
+ assertEquals(2, mgr.getRoles(user).size());
+ assertTrue(mgr.hasRole("editor", user));
+ assertTrue(mgr.hasRole("admin", user));
+ } else {
+ assertEquals(1, mgr.getRoles(user).size());
+ assertTrue(mgr.hasRole("editor", user));
+ assertFalse(mgr.hasRole("admin", user));
+ }
// remove role
- mgr.revokeRole("admin",user);
+ mgr.revokeRole("editor",user);
mgr.saveUser(user);
TestUtils.endSession(true);
@@ -199,12 +206,17 @@
user = null;
user = mgr.getUserByUserName(testUser.getUserName());
assertNotNull(user);
- assertEquals(1, user.getRoles().size());
- assertTrue(user.hasRole("editor"));
- assertFalse(user.hasRole("admin"));
-
+ if (WebloggerConfig.getBooleanProperty("users.firstUserAdmin")) {
+ assertEquals(1, mgr.getRoles(user).size());
+ assertFalse(mgr.hasRole("editor", user));
+ assertTrue(mgr.hasRole("admin", user));
+ } else {
+ assertEquals(0, mgr.getRoles(user).size());
+ assertFalse(mgr.hasRole("editor", user));
+ assertFalse(mgr.hasRole("admin", user));
+ }
// add role
- user.grantRole("admin");
+ mgr.grantRole("editor", user);
mgr.saveUser(user);
TestUtils.endSession(true);
@@ -212,12 +224,17 @@
user = null;
user = mgr.getUserByUserName(testUser.getUserName());
assertNotNull(user);
- assertEquals(2, user.getRoles().size());
- assertTrue(user.hasRole("editor"));
- assertTrue(user.hasRole("admin"));
-
+ if (WebloggerConfig.getBooleanProperty("users.firstUserAdmin")) {
+ assertEquals(2, mgr.getRoles(user).size());
+ assertTrue(mgr.hasRole("editor", user));
+ assertTrue(mgr.hasRole("admin", user));
+ } else {
+ assertEquals(1, mgr.getRoles(user).size());
+ assertTrue(mgr.hasRole("editor", user));
+ assertFalse(mgr.hasRole("admin", user));
+ }
// remove test user
- TestUtils.teardownUser(testUser.getId());
+ TestUtils.teardownUser(testUser.getUserName());
TestUtils.endSession(true);
}
Modified: roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryCRUDTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryCRUDTest.java?rev=598319&r1=598318&r2=598319&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryCRUDTest.java (original)
+++ roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryCRUDTest.java Mon Nov 26 07:51:43 2007
@@ -67,7 +67,7 @@
try {
TestUtils.teardownWeblog(testWeblog.getId());
- TestUtils.teardownUser(testUser.getId());
+ TestUtils.teardownUser(testUser.getUserName());
TestUtils.endSession(true);
} catch (Exception ex) {
log.error(ex);
@@ -84,7 +84,7 @@
log.info("BEGIN");
- WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
+ WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager();
testWeblog = TestUtils.getManagedWebsite(testWeblog);
WeblogCategory root = mgr.getRootWeblogCategory(testWeblog);
@@ -106,7 +106,7 @@
log.info("BEGIN");
- WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
+ WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager();
WeblogCategory cat = null;
List cats = null;
@@ -169,7 +169,7 @@
log.info("BEGIN");
- WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
+ WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager();
// root category is always available
testWeblog = TestUtils.getManagedWebsite(testWeblog);
Modified: roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryFunctionalityTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryFunctionalityTest.java?rev=598319&r1=598318&r2=598319&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryFunctionalityTest.java (original)
+++ roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryFunctionalityTest.java Mon Nov 26 07:51:43 2007
@@ -83,7 +83,7 @@
try {
TestUtils.teardownWeblog(testWeblog.getId());
- TestUtils.teardownUser(testUser.getId());
+ TestUtils.teardownUser(testUser.getUserName());
TestUtils.endSession(true);
} catch (Throwable t) {
log.error(t);
@@ -100,7 +100,7 @@
log.info("BEGIN");
- WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
+ WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager();
// start at root
WeblogCategory root = mgr.getRootWeblogCategory(TestUtils.getManagedWebsite(testWeblog));
@@ -150,7 +150,7 @@
log.info("BEGIN");
- WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
+ WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager();
WeblogCategory root = mgr.getRootWeblogCategory(TestUtils.getManagedWebsite(testWeblog));
@@ -168,7 +168,7 @@
log.info("BEGIN");
- WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
+ WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager();
WeblogCategory cat = mgr.getWeblogCategory(testCat.getId());
assertNotNull(cat);
@@ -185,7 +185,7 @@
log.info("BEGIN");
- WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
+ WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager();
testWeblog = TestUtils.getManagedWebsite(testWeblog);
WeblogCategory cat = mgr.getWeblogCategoryByPath(testWeblog, "/catTest-cat1");
@@ -217,7 +217,7 @@
log.info("BEGIN");
- WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
+ WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager();
// including root
testWeblog = TestUtils.getManagedWebsite(testWeblog);
@@ -239,7 +239,7 @@
*/
public void testMoveWeblogCategory() throws Exception {
- WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
+ WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager();
testWeblog = TestUtils.getManagedWebsite(testWeblog);
testUser = TestUtils.getManagedUser(testUser);
@@ -314,7 +314,7 @@
*/
public void testMoveWeblogCategoryContents() throws Exception {
- WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
+ WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager();
testWeblog = TestUtils.getManagedWebsite(testWeblog);
testUser = TestUtils.getManagedUser(testUser);
Modified: roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryParentDeletesTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryParentDeletesTest.java?rev=598319&r1=598318&r2=598319&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryParentDeletesTest.java (original)
+++ roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogCategoryParentDeletesTest.java Mon Nov 26 07:51:43 2007
@@ -65,7 +65,7 @@
log.info("BEGIN");
try {
- TestUtils.teardownUser(testUser.getId());
+ TestUtils.teardownUser(testUser.getUserName());
TestUtils.endSession(true);
} catch (Exception ex) {
log.error(ex);
@@ -82,7 +82,7 @@
log.info("BEGIN");
- WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
+ WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager();
// root category is always available
WeblogCategory root = mgr.getRootWeblogCategory(TestUtils.getManagedWebsite(testWeblog));
@@ -99,8 +99,7 @@
// now delete the weblog owning these categories
Exception ex = null;
try {
- UserManager umgr = WebloggerFactory.getWeblogger().getUserManager();
- umgr.removeWebsite(TestUtils.getManagedWebsite(testWeblog));
+ WebloggerFactory.getWeblogger().getWeblogManager().removeWeblog(TestUtils.getManagedWebsite(testWeblog));
TestUtils.endSession(true);
} catch (WebloggerException e) {
ex = e;
Modified: roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogEntryTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogEntryTest.java?rev=598319&r1=598318&r2=598319&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogEntryTest.java (original)
+++ roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogEntryTest.java Mon Nov 26 07:51:43 2007
@@ -86,7 +86,7 @@
try {
TestUtils.teardownWeblog(testWeblog.getId());
- TestUtils.teardownUser(testUser.getId());
+ TestUtils.teardownUser(testUser.getUserName());
TestUtils.endSession(true);
} catch (Exception ex) {
log.error(ex);
@@ -100,7 +100,7 @@
*/
public void testWeblogEntryCRUD() throws Exception {
- WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
+ WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager();
WeblogEntry entry = null;
WeblogEntry testEntry = new WeblogEntry();
@@ -111,7 +111,7 @@
testEntry.setPubTime(new java.sql.Timestamp(new java.util.Date().getTime()));
testEntry.setUpdateTime(new java.sql.Timestamp(new java.util.Date().getTime()));
testEntry.setWebsite(testWeblog);
- testEntry.setCreator(testUser);
+ testEntry.setCreatorUserName(testUser.getUserName());
WeblogCategory cat = mgr.getWeblogCategory(testWeblog.getDefaultCategory().getId());
testEntry.setCategory(cat);
@@ -153,7 +153,7 @@
*/
public void testWeblogEntryLookups() throws Exception {
- WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
+ WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager();
WeblogEntry entry = null;
List entries = null;
Map entryMap = null;
@@ -310,7 +310,7 @@
*/
public void testCreateAnchor() throws Exception {
- WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
+ WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager();
WeblogEntry entry = null;
List entries = null;
@@ -341,7 +341,7 @@
public void testCreateAnEntryWithTagsShortcut() throws Exception {
try {
- WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
+ WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager();
WeblogEntry entry = null;
testWeblog = TestUtils.getManagedWebsite(testWeblog);
testUser = TestUtils.getManagedUser(testUser);
@@ -356,7 +356,7 @@
testEntry.setUpdateTime(
new java.sql.Timestamp(new java.util.Date().getTime()));
testEntry.setWebsite(testWeblog);
- testEntry.setCreator(testUser);
+ testEntry.setCreatorUserName(testUser.getUserName());
testEntry.setCategory(testWeblog.getDefaultCategory());
// shortcut
@@ -391,7 +391,7 @@
public void testAddMultipleTags() throws Exception {
- WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
+ WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager();
// setup some test entries to use
testWeblog = TestUtils.getManagedWebsite(testWeblog);
@@ -419,7 +419,7 @@
public void testAddMultipleIdenticalTags() throws Exception {
- WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
+ WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager();
// setup some test entries to use
testWeblog = TestUtils.getManagedWebsite(testWeblog);
@@ -446,7 +446,7 @@
public void testRemoveTagsViaShortcut() throws Exception {
try {
- WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
+ WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager();
// setup some test entries to use
testWeblog = TestUtils.getManagedWebsite(testWeblog);
@@ -487,7 +487,7 @@
public void testTagsExist() throws Exception {
- WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
+ WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager();
testWeblog = TestUtils.getManagedWebsite(testWeblog);
testUser = TestUtils.getManagedUser(testUser);
@@ -539,7 +539,7 @@
public void testGetEntriesByTag() throws Exception {
try {
- WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
+ WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager();
// setup some test entries to use
testWeblog = TestUtils.getManagedWebsite(testWeblog);
@@ -574,7 +574,7 @@
public void testRemoveEntryTagCascading() throws Exception {
- WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
+ WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager();
// setup some test entries to use
testWeblog = TestUtils.getManagedWebsite(testWeblog);
@@ -608,7 +608,7 @@
public void testUpdateTags() throws Exception {
- WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
+ WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager();
// setup some test entries to use
testWeblog = TestUtils.getManagedWebsite(testWeblog);
@@ -658,7 +658,7 @@
*/
public void testUpdateTagTime() throws Exception {
- WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
+ WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager();
// setup some test entries to use
testWeblog = TestUtils.getManagedWebsite(testWeblog);
@@ -714,7 +714,7 @@
public void testTagAggregates() throws Exception {
log.info("BEGIN");
- WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
+ WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager();
testWeblog = TestUtils.getManagedWebsite(testWeblog);
testUser = TestUtils.getManagedUser(testUser);
@@ -724,15 +724,15 @@
// let's make sure we are starting from scratch
// site-wide
- List tags = mgr.getTags(null, null, null, -1);
+ List tags = mgr.getTags(null, null, null, 0, -1);
assertEquals(0, tags.size());
// first weblog
- tags = mgr.getTags(testWeblog, null, null, -1);
+ tags = mgr.getTags(testWeblog, null, null, 0, -1);
assertEquals(0, tags.size());
// second weblog
- tags = mgr.getTags(testWeblog2, null, null, -1);
+ tags = mgr.getTags(testWeblog2, null, null, 0, -1);
assertEquals(0, tags.size());
// setup some test entries to use
@@ -752,7 +752,7 @@
TestUtils.endSession(true);
testWeblog = TestUtils.getManagedWebsite(testWeblog);
- tags = mgr.getTags(testWeblog, null, null, -1);
+ tags = mgr.getTags(testWeblog, null, null, 0, -1);
assertEquals(3, tags.size());
HashMap expectedWeblogTags = new HashMap();
@@ -782,7 +782,7 @@
TestUtils.endSession(true);
// let's fetch "site" tags now
- tags = mgr.getTags(null, null, null, -1);
+ tags = mgr.getTags(null, null, null, 0, -1);
assertEquals(4, tags.size());
HashMap expectedSiteTags = new HashMap();
@@ -814,7 +814,7 @@
TestUtils.endSession(true);
testWeblog = TestUtils.getManagedWebsite(testWeblog);
- tags = mgr.getTags(testWeblog, null, null, -1);
+ tags = mgr.getTags(testWeblog, null, null, 0, -1);
assertEquals(4, tags.size());
expectedWeblogTags = new HashMap();
@@ -834,7 +834,7 @@
expectedCount.intValue(), stat.getCount());
}
- tags = mgr.getTags(null, null, null, -1);
+ tags = mgr.getTags(null, null, null, 0, -1);
assertEquals(5, tags.size());
expectedSiteTags = new HashMap();
@@ -873,20 +873,20 @@
testWeblog = TestUtils.getManagedWebsite(testWeblog);
testUser = TestUtils.getManagedUser(testUser);
- WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
+ WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager();
// let's make sure we are starting from scratch
// site-wide
- List tags = mgr.getTags(null, null, null, -1);
+ List tags = mgr.getTags(null, null, null, 0, -1);
assertEquals(0, tags.size());
// first weblog
- tags = mgr.getTags(testWeblog, null, null, -1);
+ tags = mgr.getTags(testWeblog, null, null, 0, -1);
assertEquals(0, tags.size());
// second weblog
- tags = mgr.getTags(testWeblog2, null, null, -1);
+ tags = mgr.getTags(testWeblog2, null, null, 0, -1);
assertEquals(0, tags.size());
// setup some test entries to use
@@ -899,7 +899,7 @@
TestUtils.endSession(true);
- tags = mgr.getTags(testWeblog, null, null, -1);
+ tags = mgr.getTags(testWeblog, null, null, 0, -1);
assertEquals(2, tags.size());
HashMap expectedWeblogTags = new HashMap();
@@ -925,7 +925,7 @@
TestUtils.endSession(true);
// let's fetch "site" tags now
- tags = mgr.getTags(null, null, null, -1);
+ tags = mgr.getTags(null, null, null, 0, -1);
assertEquals(3, tags.size());
HashMap expectedSiteTags = new HashMap();
@@ -957,6 +957,7 @@
public void testEntryAttributeCRUD() throws Exception {
WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
+ WeblogEntryManager emgr = WebloggerFactory.getWeblogger().getWeblogEntryManager();
WeblogEntry entry = null;
WeblogEntry testEntry = new WeblogEntry();
@@ -967,22 +968,22 @@
testEntry.setPubTime(new java.sql.Timestamp(new java.util.Date().getTime()));
testEntry.setUpdateTime(new java.sql.Timestamp(new java.util.Date().getTime()));
testEntry.setWebsite(testWeblog);
- testEntry.setCreator(testUser);
+ testEntry.setCreatorUserName(testUser.getUserName());
testEntry.putEntryAttribute("att_mediacast_url", "http://podcast-schmodcast.com");
testEntry.putEntryAttribute("att_mediacast_type", "application/drivel");
testEntry.putEntryAttribute("att_mediacast_length", "3141592654");
- WeblogCategory cat = mgr.getWeblogCategory(testWeblog.getDefaultCategory().getId());
+ WeblogCategory cat = emgr.getWeblogCategory(testWeblog.getDefaultCategory().getId());
testEntry.setCategory(cat);
// create a weblog entry
- mgr.saveWeblogEntry(testEntry);
+ emgr.saveWeblogEntry(testEntry);
String id = testEntry.getId();
TestUtils.endSession(true);
// make sure entry was created
- entry = mgr.getWeblogEntry(id);
+ entry = emgr.getWeblogEntry(id);
assertNotNull(entry);
assertEquals(testEntry, entry);
assertNotNull(entry.getEntryAttributes());
@@ -996,38 +997,42 @@
// update a weblog entry
entry.setTitle("testtest");
- mgr.saveWeblogEntry(entry);
+ emgr.saveWeblogEntry(entry);
TestUtils.endSession(true);
// make sure entry was updated
entry = null;
- entry = mgr.getWeblogEntry(id);
+ entry = emgr.getWeblogEntry(id);
assertNotNull(entry);
assertEquals("testtest", entry.getTitle());
// delete a weblog entry
- mgr.removeWeblogEntry(entry);
+ emgr.removeWeblogEntry(entry);
TestUtils.endSession(true);
// make sure entry was deleted
entry = null;
- entry = mgr.getWeblogEntry(id);
+ 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();
+ long existingUserCount = umgr.getUserCount() - 1;
+
User user1 = TestUtils.setupUser("statuser1");
Weblog blog1 = TestUtils.setupWeblog("statblog1", user1);
Weblog blog2 = TestUtils.setupWeblog("statblog2", user1);
Weblog blog3 = TestUtils.setupWeblog("statblog3", user1);
blog3.setEnabled(Boolean. FALSE);
- umgr.saveWebsite(blog3);
+ wmgr.saveWeblog(blog3);
WeblogEntry entry1 = TestUtils.setupWeblogEntry("entry1",
testWeblog.getDefaultCategory(), blog1, user1);
@@ -1050,19 +1055,19 @@
TestUtils.endSession(true);
try {
- blog1 = umgr.getWebsite(blog1.getId());
- blog2 = umgr.getWebsite(blog2.getId());
+ blog1 = wmgr.getWeblog(blog1.getId());
+ blog2 = wmgr.getWeblog(blog2.getId());
assertEquals(2L, blog1.getEntryCount());
assertEquals(3L, blog2.getEntryCount());
- assertEquals(5L, wmgr.getEntryCount());
+ assertEquals(5L, emgr.getEntryCount());
assertEquals(2L, blog1.getCommentCount());
assertEquals(3L, blog2.getCommentCount());
- assertEquals(5L, wmgr.getCommentCount());
+ assertEquals(5L, emgr.getCommentCount());
- assertEquals(4L, umgr.getWeblogCount());
- assertEquals(2L, umgr.getUserCount());
+ assertEquals(4L, wmgr.getWeblogCount());
+ assertEquals(existingUserCount + 2L, umgr.getUserCount());
} finally {
@@ -1082,7 +1087,7 @@
TestUtils.teardownWeblog(blog2.getId());
TestUtils.teardownWeblog(blog3.getId());
- TestUtils.teardownUser(user1.getId());
+ TestUtils.teardownUser(user1.getUserName());
TestUtils.endSession(true);
}
Modified: roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogPageTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogPageTest.java?rev=598319&r1=598318&r2=598319&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogPageTest.java (original)
+++ roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogPageTest.java Mon Nov 26 07:51:43 2007
@@ -86,7 +86,7 @@
try {
TestUtils.teardownWeblog(testWeblog.getId());
- TestUtils.teardownUser(testUser.getId());
+ TestUtils.teardownUser(testUser.getUserName());
TestUtils.endSession(true);
} catch (Exception ex) {
log.error(ex);
@@ -102,7 +102,7 @@
*/
public void testTemplateCRUD() throws Exception {
- UserManager mgr = WebloggerFactory.getWeblogger().getUserManager();
+ WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
WeblogTemplate template = null;
// create template
@@ -145,7 +145,7 @@
*/
public void testPermissionsLookups() throws Exception {
- UserManager mgr = WebloggerFactory.getWeblogger().getUserManager();
+ WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
WeblogTemplate page = null;
// create page
Modified: roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogStatsTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogStatsTest.java?rev=598319&r1=598318&r2=598319&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogStatsTest.java (original)
+++ roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogStatsTest.java Mon Nov 26 07:51:43 2007
@@ -6,7 +6,7 @@
import org.apache.roller.weblogger.TestUtils;
import org.apache.roller.weblogger.business.WebloggerFactory;
import org.apache.roller.weblogger.business.UserManager;
-import org.apache.roller.weblogger.business.WeblogManager;
+import org.apache.roller.weblogger.business.WeblogEntryManager;
import org.apache.roller.weblogger.pojos.WeblogEntryComment;
import org.apache.roller.weblogger.pojos.StatCount;
import org.apache.roller.weblogger.pojos.User;
@@ -54,8 +54,8 @@
TestUtils.endSession(true);
}
public void testGetMostCommentedWeblogs() throws Exception {
- UserManager mgr = WebloggerFactory.getWeblogger().getUserManager();
- List list = mgr.getMostCommentedWebsites(null, null, 0, -1);
+ WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
+ List list = mgr.getMostCommentedWeblogs(null, null, 0, -1);
assertNotNull(list);
assertEquals(2, list.size());
@@ -72,7 +72,7 @@
}
public void testGetMostCommentedWeblogEntries() throws Exception {
- WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
+ WeblogEntryManager mgr = WebloggerFactory.getWeblogger().getWeblogEntryManager();
List list = mgr.getMostCommentedWeblogEntries(null, null, null, 0, -1);
assertNotNull(list);
@@ -95,7 +95,7 @@
assertNull(map.get("c"));
}
public void testGetWeblogLetterMap() throws Exception {
- UserManager mgr = WebloggerFactory.getWeblogger().getUserManager();
+ WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
Map map = mgr.getWeblogHandleLetterMap();
assertNotNull(map.get("a"));
assertNotNull(map.get("b"));
@@ -112,8 +112,8 @@
TestUtils.teardownComment(comment21.getId());
TestUtils.teardownWeblog(website2.getId());
- TestUtils.teardownUser(user1.getId());
- TestUtils.teardownUser(user2.getId());
+ TestUtils.teardownUser(user1.getUserName());
+ TestUtils.teardownUser(user2.getUserName());
TestUtils.endSession(true);
}
Modified: roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogTest.java?rev=598319&r1=598318&r2=598319&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogTest.java (original)
+++ roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/business/WeblogTest.java Mon Nov 26 07:51:43 2007
@@ -77,7 +77,7 @@
log.info("BEGIN");
try {
- TestUtils.teardownUser(testUser.getId());
+ TestUtils.teardownUser(testUser.getUserName());
TestUtils.endSession(true);
} catch (Exception ex) {
log.error(ex);
@@ -97,7 +97,8 @@
try {
- UserManager mgr = WebloggerFactory.getWeblogger().getUserManager();
+ WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
+
Weblog weblog = null;
Weblog testWeblog = new Weblog();
@@ -113,41 +114,41 @@
testWeblog.setLocale("en_US");
testWeblog.setTimeZone("America/Los_Angeles");
testWeblog.setDateCreated(new java.util.Date());
- testWeblog.setCreator(testUser);
+ testWeblog.setCreatorUserName(testUser.getUserName());
// make sure test weblog does not exist
- weblog = mgr.getWebsiteByHandle(testWeblog.getHandle());
+ weblog = mgr.getWeblogByHandle(testWeblog.getHandle());
assertNull(weblog);
// add test weblog
- mgr.addWebsite(testWeblog);
+ mgr.addWeblog(testWeblog);
String id = testWeblog.getId();
TestUtils.endSession(true);
// make sure test weblog exists
weblog = null;
- weblog = mgr.getWebsite(id);
+ weblog = mgr.getWeblog(id);
assertNotNull(weblog);
assertEquals(testWeblog, weblog);
// modify weblog and save
weblog.setName("testtesttest");
- mgr.saveWebsite(weblog);
+ mgr.saveWeblog(weblog);
TestUtils.endSession(true);
// make sure changes were saved
weblog = null;
- weblog = mgr.getWebsite(id);
+ weblog = mgr.getWeblog(id);
assertNotNull(weblog);
assertEquals("testtesttest", weblog.getName());
// remove test weblog
- mgr.removeWebsite(weblog);
+ mgr.removeWeblog(weblog);
TestUtils.endSession(true);
// make sure weblog no longer exists
weblog = null;
- weblog = mgr.getWebsite(id);
+ weblog = mgr.getWeblog(id);
assertNull(weblog);
} catch(Throwable t) {
@@ -167,7 +168,8 @@
Weblog testWeblog1 = null;
Weblog testWeblog2 = null;
try {
- UserManager mgr = WebloggerFactory.getWeblogger().getUserManager();
+ WeblogManager mgr = WebloggerFactory.getWeblogger().getWeblogManager();
+
Weblog weblog = null;
// add test weblogs
@@ -176,65 +178,56 @@
TestUtils.endSession(true);
// lookup by id
- weblog = mgr.getWebsite(testWeblog1.getId());
+ weblog = mgr.getWeblog(testWeblog1.getId());
assertNotNull(weblog);
assertEquals(testWeblog1.getHandle(), weblog.getHandle());
// lookup by weblog handle
weblog = null;
- weblog = mgr.getWebsiteByHandle(testWeblog1.getHandle());
+ weblog = mgr.getWeblogByHandle(testWeblog1.getHandle());
assertNotNull(weblog);
assertEquals(testWeblog1.getHandle(), weblog.getHandle());
// make sure disable weblogs are not returned
weblog.setEnabled(Boolean.FALSE);
- mgr.saveWebsite(weblog);
+ mgr.saveWeblog(weblog);
TestUtils.endSession(true);
weblog = null;
- weblog = mgr.getWebsiteByHandle(testWeblog1.getHandle());
+ weblog = mgr.getWeblogByHandle(testWeblog1.getHandle());
assertNull(weblog);
// restore enabled state
- weblog = mgr.getWebsiteByHandle(testWeblog1.getHandle(), Boolean.FALSE);
+ weblog = mgr.getWeblogByHandle(testWeblog1.getHandle(), Boolean.FALSE);
weblog.setEnabled(Boolean.TRUE);
- mgr.saveWebsite(weblog);
+ mgr.saveWeblog(weblog);
TestUtils.endSession(true);
weblog = null;
- weblog = mgr.getWebsiteByHandle(testWeblog1.getHandle());
+ weblog = mgr.getWeblogByHandle(testWeblog1.getHandle());
assertNotNull(weblog);
// get all weblogs for user
weblog = null;
- List weblogs1 = mgr.getWebsites(TestUtils.getManagedUser(testUser), Boolean.TRUE, Boolean.TRUE, null, null, 0, -1);
+ List weblogs1 = mgr.getUserWeblogs(TestUtils.getManagedUser(testUser), true);
assertEquals(2, weblogs1.size());
weblog = (Weblog) weblogs1.get(0);
- assertNotNull(weblog);
-
- // testing paging
- List weblogs11 = mgr.getWebsites(TestUtils.getManagedUser(testUser), Boolean.TRUE, Boolean.TRUE, null, null, 0, 1);
- assertEquals(1, weblogs11.size());
- List weblogs12 = mgr.getWebsites(TestUtils.getManagedUser(testUser), Boolean.TRUE, Boolean.TRUE, null, null, 1, 1);
- assertEquals(1, weblogs12.size());
+ assertNotNull(weblog);
// make sure disabled weblogs are not returned
weblog.setEnabled(Boolean.FALSE);
- mgr.saveWebsite(weblog);
+ mgr.saveWeblog(weblog);
TestUtils.endSession(true);
- List weblogs2 = mgr.getWebsites(TestUtils.getManagedUser(testUser), Boolean.TRUE, Boolean.TRUE, null, null, 0, -1);
+ List weblogs2 = mgr.getUserWeblogs(TestUtils.getManagedUser(testUser), true);
assertEquals(1, weblogs2.size());
weblog = (Weblog) weblogs2.get(0);
assertNotNull(weblog);
// make sure inactive weblogs are not returned
weblog.setActive(Boolean.FALSE);
- mgr.saveWebsite(weblog);
+ mgr.saveWeblog(weblog);
TestUtils.endSession(true);
- List weblogs3 = mgr.getWebsites(TestUtils.getManagedUser(testUser), Boolean.TRUE, Boolean.TRUE, null, null, 0, -1);
+ List weblogs3 = mgr.getUserWeblogs(TestUtils.getManagedUser(testUser), true);
assertEquals(0, weblogs3.size());
- } catch(Throwable t) {
- log.error("Exception running test", t);
- throw (Exception) t;
} finally {
TestUtils.teardownWeblog(testWeblog1.getId());
TestUtils.teardownWeblog(testWeblog2.getId());
Modified: roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcherTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcherTest.java?rev=598319&r1=598318&r2=598319&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcherTest.java (original)
+++ roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/planet/business/WebloggerRomeFeedFetcherTest.java Mon Nov 26 07:51:43 2007
@@ -66,7 +66,7 @@
try {
TestUtils.teardownWeblog(testWeblog.getId());
- TestUtils.teardownUser(testUser.getId());
+ TestUtils.teardownUser(testUser.getUserName());
TestUtils.endSession(true);
} catch (Exception ex) {
log.error(ex);
Modified: roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/ui/rendering/util/CommentValidatorTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/ui/rendering/util/CommentValidatorTest.java?rev=598319&r1=598318&r2=598319&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/ui/rendering/util/CommentValidatorTest.java (original)
+++ roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/ui/rendering/util/CommentValidatorTest.java Mon Nov 26 07:51:43 2007
@@ -60,7 +60,7 @@
protected void tearDown() throws Exception {
TestUtils.teardownWeblogEntry(entry.getId());
TestUtils.teardownWeblog(weblog.getId());
- TestUtils.teardownUser(user.getId());
+ TestUtils.teardownUser(user.getUserName());
}
public void testExcessSizeCommentValidator() {
Modified: roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/adminapi/HandlerBaseTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/adminapi/HandlerBaseTest.java?rev=598319&r1=598318&r2=598319&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/adminapi/HandlerBaseTest.java (original)
+++ roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/adminapi/HandlerBaseTest.java Mon Nov 26 07:51:43 2007
@@ -19,6 +19,7 @@
import java.io.IOException;
import java.io.InputStream;
+import org.apache.commons.codec.binary.Base64;
import org.apache.commons.httpclient.HttpClient;
import org.apache.commons.httpclient.HttpMethod;
import org.apache.commons.httpclient.methods.DeleteMethod;
@@ -26,7 +27,6 @@
import org.apache.commons.httpclient.methods.GetMethod;
import org.apache.commons.httpclient.methods.PostMethod;
import org.apache.commons.httpclient.methods.PutMethod;
-import org.apache.commons.httpclient.util.Base64;
import org.apache.roller.weblogger.webservices.adminprotocol.sdk.MemberEntry;
import org.apache.roller.weblogger.webservices.adminprotocol.sdk.MemberEntrySet;
import org.apache.roller.weblogger.webservices.adminprotocol.sdk.UnexpectedRootElementException;
@@ -391,7 +391,8 @@
private static void addAuthHeader(HttpMethod method, String user, String password) {
String credentials = user + ":" + password;
- method.setRequestHeader("Authorization", "Basic " + new String(Base64.encode(credentials.getBytes())));
+ Base64 base64 = new Base64();
+ method.setRequestHeader("Authorization", "Basic " + new String(base64.encode(credentials.getBytes())));
}
}
Modified: roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/xmlrpc/RollerXmlRpcServerTest.java
URL: http://svn.apache.org/viewvc/roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/xmlrpc/RollerXmlRpcServerTest.java?rev=598319&r1=598318&r2=598319&view=diff
==============================================================================
--- roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/xmlrpc/RollerXmlRpcServerTest.java (original)
+++ roller/trunk/apps/weblogger/test/java/org/apache/roller/weblogger/webservices/xmlrpc/RollerXmlRpcServerTest.java Mon Nov 26 07:51:43 2007
@@ -172,9 +172,9 @@
testEntry1.setPubTime(new Timestamp(new Date().getTime()));
testEntry1.setUpdateTime(new Timestamp(new Date().getTime()));
testEntry1.setWebsite(testWeblog);
- testEntry1.setCreator(testUser);
+ testEntry1.setCreatorUserName(testUser.getUserName());
testEntry1.setCategory(testWeblog.getDefaultCategory());
- WebloggerFactory.getWeblogger().getWeblogManager().saveWeblogEntry(testEntry1);
+ WebloggerFactory.getWeblogger().getWeblogEntryManager().saveWeblogEntry(testEntry1);
WeblogEntry testEntry2 = new WeblogEntry();
testEntry2.setTitle("entryTestEntry2");
@@ -184,9 +184,9 @@
testEntry2.setPubTime(new Timestamp(new Date().getTime()));
testEntry2.setUpdateTime(new Timestamp(new Date().getTime()));
testEntry2.setWebsite(testWeblog);
- testEntry2.setCreator(testUser);
+ testEntry2.setCreatorUserName(testUser.getUserName());
testEntry2.setCategory(testWeblog.getDefaultCategory());
- WebloggerFactory.getWeblogger().getWeblogManager().saveWeblogEntry(testEntry1);
+ WebloggerFactory.getWeblogger().getWeblogEntryManager().saveWeblogEntry(testEntry1);
WeblogEntry testEntry3 = new WeblogEntry();
testEntry3.setTitle("entryTestEntry3");
@@ -196,9 +196,9 @@
testEntry3.setPubTime(new Timestamp(new Date().getTime()));
testEntry3.setUpdateTime(new Timestamp(new Date().getTime()));
testEntry3.setWebsite(testWeblog);
- testEntry3.setCreator(testUser);
+ testEntry3.setCreatorUserName(testUser.getUserName());
testEntry3.setCategory(testWeblog.getDefaultCategory());
- WebloggerFactory.getWeblogger().getWeblogManager().saveWeblogEntry(testEntry1);
+ WebloggerFactory.getWeblogger().getWeblogEntryManager().saveWeblogEntry(testEntry1);
TestUtils.endSession(true);
@@ -212,7 +212,7 @@
try {
TestUtils.teardownWeblog(testWeblog.getId());
- TestUtils.teardownUser(testUser.getId());
+ TestUtils.teardownUser(testUser.getUserName());
TestUtils.endSession(true);
mockRequest = null;