Author: agilliland
Date: Thu Apr 13 13:56:41 2006
New Revision: 393935
URL: http://svn.apache.org/viewcvs?rev=393935&view=rev
Log:
lots of little tweaks, fixes, and general cleanup for unit tests.
Modified:
incubator/roller/branches/roller-newbackend/tests/org/roller/TestUtils.java
incubator/roller/branches/roller-newbackend/tests/org/roller/business/CommentTest.java
incubator/roller/branches/roller-newbackend/tests/org/roller/business/FileManagerTest.java
incubator/roller/branches/roller-newbackend/tests/org/roller/business/PermissionTest.java
incubator/roller/branches/roller-newbackend/tests/org/roller/business/PingsTest.java
incubator/roller/branches/roller-newbackend/tests/org/roller/business/UserTest.java
incubator/roller/branches/roller-newbackend/tests/org/roller/business/WeblogEntryTest.java
incubator/roller/branches/roller-newbackend/tests/org/roller/business/WeblogPageTest.java
incubator/roller/branches/roller-newbackend/tests/org/roller/business/WeblogTest.java
Modified:
incubator/roller/branches/roller-newbackend/tests/org/roller/TestUtils.java
URL:
http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/tests/org/roller/TestUtils.java?rev=393935&r1=393934&r2=393935&view=diff
==============================================================================
--- incubator/roller/branches/roller-newbackend/tests/org/roller/TestUtils.java
(original)
+++ incubator/roller/branches/roller-newbackend/tests/org/roller/TestUtils.java
Thu Apr 13 13:56:41 2006
@@ -57,11 +57,11 @@
/**
* Convenience method for removing a user.
*/
- public static void teardownUser(String username) throws Exception {
+ public static void teardownUser(String id) throws Exception {
// lookup the user
UserManager mgr = RollerFactory.getRoller().getUserManager();
- UserData user = mgr.getUser(username);
+ UserData user = mgr.retrieveUser(id);
// remove the user
mgr.removeUser(user);
@@ -104,11 +104,11 @@
/**
* Convenience method for removing a weblog.
*/
- public static void teardownWeblog(String handle) throws Exception {
+ public static void teardownWeblog(String id) throws Exception {
// lookup the weblog
UserManager mgr = RollerFactory.getRoller().getUserManager();
- WebsiteData weblog = mgr.getWebsiteByHandle(handle);
+ WebsiteData weblog = mgr.retrieveWebsite(id);
// remove the weblog
mgr.removeWebsite(weblog);
Modified:
incubator/roller/branches/roller-newbackend/tests/org/roller/business/CommentTest.java
URL:
http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/tests/org/roller/business/CommentTest.java?rev=393935&r1=393934&r2=393935&view=diff
==============================================================================
---
incubator/roller/branches/roller-newbackend/tests/org/roller/business/CommentTest.java
(original)
+++
incubator/roller/branches/roller-newbackend/tests/org/roller/business/CommentTest.java
Thu Apr 13 13:56:41 2006
@@ -63,8 +63,8 @@
try {
TestUtils.teardownWeblogEntry(testEntry.getId());
- TestUtils.teardownWeblog(testWeblog.getHandle());
- TestUtils.teardownUser(testUser.getUserName());
+ TestUtils.teardownWeblog(testWeblog.getId());
+ TestUtils.teardownUser(testUser.getId());
} catch (Exception ex) {
log.error(ex);
}
Modified:
incubator/roller/branches/roller-newbackend/tests/org/roller/business/FileManagerTest.java
URL:
http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/tests/org/roller/business/FileManagerTest.java?rev=393935&r1=393934&r2=393935&view=diff
==============================================================================
---
incubator/roller/branches/roller-newbackend/tests/org/roller/business/FileManagerTest.java
(original)
+++
incubator/roller/branches/roller-newbackend/tests/org/roller/business/FileManagerTest.java
Thu Apr 13 13:56:41 2006
@@ -53,8 +53,8 @@
public void tearDown() throws Exception {
try {
- TestUtils.teardownWeblog(testWeblog.getHandle());
- TestUtils.teardownUser(testUser.getUserName());
+ TestUtils.teardownWeblog(testWeblog.getId());
+ TestUtils.teardownUser(testUser.getId());
} catch (Exception ex) {
log.error(ex);
}
Modified:
incubator/roller/branches/roller-newbackend/tests/org/roller/business/PermissionTest.java
URL:
http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/tests/org/roller/business/PermissionTest.java?rev=393935&r1=393934&r2=393935&view=diff
==============================================================================
---
incubator/roller/branches/roller-newbackend/tests/org/roller/business/PermissionTest.java
(original)
+++
incubator/roller/branches/roller-newbackend/tests/org/roller/business/PermissionTest.java
Thu Apr 13 13:56:41 2006
@@ -16,20 +16,6 @@
/**
* Test User/Weblog Permissions related business operations.
- *
- * That includes:
- * - creating permissions for a user/weblog
- * - updating permissions for a user/weblog
- * - deleting permissions for a user/weblog
- * - get all permissions for a user
- * - get all permissions for a weblog
- * - get pending permissions for a user
- * - get pending permissions for a weblog
- * - get permissions by id
- * - get permissions for a specific user/weblog
- * - user can be invited to website
- * - user can retire from website
- *
*/
public class PermissionTest extends TestCase {
@@ -53,18 +39,26 @@
* All tests in this suite require a user and a weblog.
*/
public void setUp() throws Exception {
- testUser = TestUtils.setupUser("permsTestUser");
- testWeblog = TestUtils.setupWeblog("permsTestWeblog", testUser);
+ try {
+ testUser = TestUtils.setupUser("permsTestUser");
+ testWeblog = TestUtils.setupWeblog("permsTestWeblog", testUser);
+ } catch (Exception ex) {
+ log.error(ex);
+ }
}
public void tearDown() throws Exception {
- TestUtils.teardownWeblog(testWeblog.getHandle());
- TestUtils.teardownUser(testUser.getUserName());
+ try {
+ TestUtils.teardownWeblog(testWeblog.getId());
+ TestUtils.teardownUser(testUser.getId());
+ } catch (Exception ex) {
+ log.error(ex);
+ }
}
/**
- * Test basic persistence operations ... Create, Update, Delete
+ * Test basic persistence operations ... Create, Update, Delete.
*/
public void testPermissionsCRUD() throws Exception {
@@ -108,7 +102,7 @@
/**
- * Test lookup mechanisms ...
+ * Test lookup mechanisms.
*/
public void testPermissionsLookups() throws Exception {
@@ -165,7 +159,20 @@
assertEquals(true, perm.isPending());
// cleanup the extra test user
- TestUtils.teardownUser(user.getUserName());
+ TestUtils.teardownUser(user.getId());
+ }
+
+
+ /**
+ * Test advanced CRUD methods.
+ */
+ public void testAdvancedPermissionCRUD() throws Exception {
+ // TODO: implement testAdvancedPermissionCRUD
+
+ // add permissions (collection)
+
+ // store permissions (collection)
+
}
@@ -216,7 +223,7 @@
assertEquals(0, weblogs.size());
// cleanup the extra test user
- TestUtils.teardownUser(user.getUserName());
+ TestUtils.teardownUser(user.getId());
}
}
Modified:
incubator/roller/branches/roller-newbackend/tests/org/roller/business/PingsTest.java
URL:
http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/tests/org/roller/business/PingsTest.java?rev=393935&r1=393934&r2=393935&view=diff
==============================================================================
---
incubator/roller/branches/roller-newbackend/tests/org/roller/business/PingsTest.java
(original)
+++
incubator/roller/branches/roller-newbackend/tests/org/roller/business/PingsTest.java
Thu Apr 13 13:56:41 2006
@@ -82,8 +82,8 @@
public void tearDown() throws Exception {
try {
- TestUtils.teardownWeblog(testWeblog.getHandle());
- TestUtils.teardownUser(testUser.getUserName());
+ TestUtils.teardownWeblog(testWeblog.getId());
+ TestUtils.teardownUser(testUser.getId());
} catch (Exception ex) {
log.error(ex);
}
Modified:
incubator/roller/branches/roller-newbackend/tests/org/roller/business/UserTest.java
URL:
http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/tests/org/roller/business/UserTest.java?rev=393935&r1=393934&r2=393935&view=diff
==============================================================================
---
incubator/roller/branches/roller-newbackend/tests/org/roller/business/UserTest.java
(original)
+++
incubator/roller/branches/roller-newbackend/tests/org/roller/business/UserTest.java
Thu Apr 13 13:56:41 2006
@@ -1,12 +1,15 @@
package org.roller.business;
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+import org.roller.TestUtils;
import org.roller.model.RollerFactory;
import org.roller.model.UserManager;
import org.roller.pojos.UserData;
@@ -14,24 +17,11 @@
/**
* Test User related business operations.
- *
- * That includes:
- * - creating a user
- * - updating a user
- * - deleting a user
- * - getting a user by id
- * - getting a user by username (enabled and disabled)
- * - getting a user starting with XXX
- * - adding a role for a user
- * - removing a role for a user
- *
*/
public class UserTest extends TestCase {
public static Log log = LogFactory.getLog(UserTest.class);
- UserData testUser = null;
-
public UserTest(String name) {
super(name);
@@ -44,77 +34,74 @@
public void setUp() throws Exception {
-
- testUser = new UserData();
- testUser.setUserName("testUser");
- testUser.setPassword("password");
- testUser.setFullName("Test User");
- testUser.setEmailAddress("[EMAIL PROTECTED]");
- testUser.setLocale("en_US");
- testUser.setTimeZone("America/Los_Angeles");
- testUser.setDateCreated(new java.util.Date());
- testUser.setEnabled(Boolean.TRUE);
}
public void tearDown() throws Exception {
- testUser = null;
}
/**
- * Test basic persistence operations ... Create, Update, Delete
+ * Test basic persistence operations ... Create, Update, Delete.
*/
public void testUserCRUD() throws Exception {
UserManager mgr = RollerFactory.getRoller().getUserManager();
UserData user = null;
+ UserData testUser = new UserData();
+ testUser.setUserName("testUser");
+ testUser.setPassword("password");
+ testUser.setFullName("Test User");
+ testUser.setEmailAddress("[EMAIL PROTECTED]");
+ testUser.setLocale("en_US");
+ testUser.setTimeZone("America/Los_Angeles");
+ testUser.setDateCreated(new java.util.Date());
+ testUser.setEnabled(Boolean.TRUE);
+
// make sure test user does not exist
user = mgr.getUser(testUser.getUserName());
assertNull(user);
// add test user
mgr.addUser(testUser);
+ String id = testUser.getId();
// make sure test user exists
- user = mgr.getUser(testUser.getUserName());
+ user = null;
+ user = mgr.retrieveUser(id);
assertNotNull(user);
- assertEquals(testUser.getUserName(), user.getUserName());
+ assertEquals(testUser, user);
// modify user and save
user.setFullName("testtesttest");
mgr.storeUser(user);
- user = null;
// make sure changes were saved
- user = mgr.getUser(testUser.getUserName());
+ user = null;
+ user = mgr.retrieveUser(id);
assertNotNull(user);
assertEquals("testtesttest", user.getFullName());
// remove test user
mgr.removeUser(user);
- user = null;
// make sure user no longer exists
- user = mgr.getUser(testUser.getUserName());
+ user = null;
+ user = mgr.retrieveUser(id);
assertNull(user);
}
/**
- * Test lookup mechanisms ... Id, UserName, UserName (part), Email (part)
+ * Test lookup mechanisms.
*/
public void testUserLookups() throws Exception {
UserManager mgr = RollerFactory.getRoller().getUserManager();
UserData user = null;
- // make sure test user does not exist
- user = mgr.getUser(testUser.getUserName());
- assertNull(user);
-
// add test user
- mgr.addUser(testUser);
+ UserData testUser = TestUtils.setupUser("userTestUser");
// lookup by username
user = mgr.getUser(testUser.getUserName());
@@ -152,10 +139,7 @@
assertNull(user);
// remove test user
- user = mgr.getUser(testUser.getUserName(), Boolean.FALSE);
- assertNotNull(user);
- mgr.removeUser(user);
- user = null;
+ TestUtils.teardownUser(testUser.getId());
}
@@ -167,43 +151,111 @@
UserManager mgr = RollerFactory.getRoller().getUserManager();
UserData user = null;
- // make sure test user does not exist
- user = mgr.getUser(testUser.getUserName());
- assertNull(user);
-
// add test user
- mgr.addUser(testUser);
+ UserData testUser = TestUtils.setupUser("userTestUser");
// verify user has 2 roles, admin & editor
user = mgr.getUser(testUser.getUserName());
assertNotNull(user);
- assertEquals(user.getRoles().size(), 2);
+ assertEquals(2, user.getRoles().size());
assertTrue(user.hasRole("editor"));
assertTrue(user.hasRole("admin"));
// remove role
user.revokeRole("admin");
mgr.storeUser(user);
+
+ // check that role was removed
user = null;
user = mgr.getUser(testUser.getUserName());
assertNotNull(user);
- assertEquals(user.getRoles().size(), 1);
+ assertEquals(1, user.getRoles().size());
assertTrue(user.hasRole("editor"));
assertFalse(user.hasRole("admin"));
// add role
user.grantRole("admin");
mgr.storeUser(user);
+
+ // check that role was added
user = null;
user = mgr.getUser(testUser.getUserName());
assertNotNull(user);
- assertEquals(user.getRoles().size(), 2);
+ assertEquals(2, user.getRoles().size());
assertTrue(user.hasRole("editor"));
assertTrue(user.hasRole("admin"));
// remove test user
- mgr.removeUser(user);
- user = null;
+ TestUtils.teardownUser(testUser.getId());
+ }
+
+
+ /**
+ * Test advanced CRUD methods.
+ */
+ public void testAdvancedUserCRUD() throws Exception {
+
+ UserManager mgr = RollerFactory.getRoller().getUserManager();
+ List users = null;
+
+ // some users to test with
+ UserData testUser1 = new UserData();
+ testUser1.setUserName("testUser1");
+ testUser1.setPassword("password");
+ testUser1.setFullName("Test User");
+ testUser1.setEmailAddress("[EMAIL PROTECTED]");
+ testUser1.setLocale("en_US");
+ testUser1.setTimeZone("America/Los_Angeles");
+ testUser1.setDateCreated(new java.util.Date());
+ testUser1.setEnabled(Boolean.TRUE);
+
+ UserData testUser2 = new UserData();
+ testUser2.setUserName("testUser2");
+ testUser2.setPassword("password");
+ testUser2.setFullName("Test User");
+ testUser2.setEmailAddress("[EMAIL PROTECTED]");
+ testUser2.setLocale("en_US");
+ testUser2.setTimeZone("America/Los_Angeles");
+ testUser2.setDateCreated(new java.util.Date());
+ testUser2.setEnabled(Boolean.TRUE);
+
+ Collection newUsers = new ArrayList();
+ newUsers.add(testUser1);
+ newUsers.add(testUser2);
+
+ // add users (collection)
+ mgr.addUsers(newUsers);
+
+ // make sure users were added
+ users = null;
+ users = mgr.getUsers();
+ assertNotNull(users);
+ assertEquals(2, users.size());
+
+ // store users (collection)
+ testUser1.setFullName("blahblah");
+ testUser2.setFullName("foofoo");
+ mgr.storeUsers(newUsers);
+
+ // make sure users were stored
+ users = null;
+ users = mgr.getUsers();
+ assertNotNull(users);
+ assertEquals(2, users.size());
+ assertTrue(((UserData)users.get(0)).getFullName().equals("blahblah") ||
+ ((UserData)users.get(1)).getFullName().equals("blahblah"));
+
+ // remove users (collection)
+ TestUtils.teardownUser(testUser1.getId());
+ TestUtils.teardownUser(testUser2.getId());
+ }
+
+
+ /**
+ * Test ability to remove a user with a full set of data.
+ */
+ public void testRemoveLoadedUser() throws Exception {
+ // TODO: implement testRemoveLoadedUser
}
}
Modified:
incubator/roller/branches/roller-newbackend/tests/org/roller/business/WeblogEntryTest.java
URL:
http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/tests/org/roller/business/WeblogEntryTest.java?rev=393935&r1=393934&r2=393935&view=diff
==============================================================================
---
incubator/roller/branches/roller-newbackend/tests/org/roller/business/WeblogEntryTest.java
(original)
+++
incubator/roller/branches/roller-newbackend/tests/org/roller/business/WeblogEntryTest.java
Thu Apr 13 13:56:41 2006
@@ -59,8 +59,8 @@
public void tearDown() throws Exception {
try {
- TestUtils.teardownWeblog(testWeblog.getHandle());
- TestUtils.teardownUser(testUser.getUserName());
+ TestUtils.teardownWeblog(testWeblog.getId());
+ TestUtils.teardownUser(testUser.getId());
} catch (Exception ex) {
log.error(ex);
}
Modified:
incubator/roller/branches/roller-newbackend/tests/org/roller/business/WeblogPageTest.java
URL:
http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/tests/org/roller/business/WeblogPageTest.java?rev=393935&r1=393934&r2=393935&view=diff
==============================================================================
---
incubator/roller/branches/roller-newbackend/tests/org/roller/business/WeblogPageTest.java
(original)
+++
incubator/roller/branches/roller-newbackend/tests/org/roller/business/WeblogPageTest.java
Thu Apr 13 13:56:41 2006
@@ -21,16 +21,7 @@
/**
- * Test WeblogPage related business operations.
- *
- * That includes:
- * - create a template
- * - update a template
- * - delete a template
- * - get a template by id
- * - get a template by name
- * - get a template by link
- *
+ * Test Weblog Page related business operations.
*/
public class WeblogPageTest extends TestCase {
@@ -75,8 +66,8 @@
public void tearDown() throws Exception {
try {
- TestUtils.teardownWeblog(testWeblog.getHandle());
- TestUtils.teardownUser(testUser.getUserName());
+ TestUtils.teardownWeblog(testWeblog.getId());
+ TestUtils.teardownUser(testUser.getId());
} catch (Exception ex) {
log.error(ex);
}
Modified:
incubator/roller/branches/roller-newbackend/tests/org/roller/business/WeblogTest.java
URL:
http://svn.apache.org/viewcvs/incubator/roller/branches/roller-newbackend/tests/org/roller/business/WeblogTest.java?rev=393935&r1=393934&r2=393935&view=diff
==============================================================================
---
incubator/roller/branches/roller-newbackend/tests/org/roller/business/WeblogTest.java
(original)
+++
incubator/roller/branches/roller-newbackend/tests/org/roller/business/WeblogTest.java
Thu Apr 13 13:56:41 2006
@@ -1,12 +1,14 @@
package org.roller.business;
+import java.util.ArrayList;
+import java.util.Collection;
import java.util.List;
import junit.framework.Test;
import junit.framework.TestCase;
import junit.framework.TestSuite;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.roller.RollerException;
+import org.roller.TestUtils;
import org.roller.model.RollerFactory;
import org.roller.model.UserManager;
import org.roller.pojos.UserData;
@@ -15,23 +17,12 @@
/**
* Test Weblog related business operations.
- *
- * That includes:
- * - create a weblog
- * - update a weblog
- * - delete a weblog
- * - get a weblog by id
- * - get a weblog by handle (enabled and disabled)
- * - get all weblogs for a user (enabled and disabled, active and inactive)
- *
*/
public class WeblogTest extends TestCase {
public static Log log = LogFactory.getLog(WeblogTest.class);
UserData testUser = null;
- WebsiteData testWeblog1 = null;
- WebsiteData testWeblog2 = null;
public WeblogTest(String name) {
@@ -45,133 +36,97 @@
/**
- * All tests in this suite require a User to run, so we
- * create that user now and add them to the db.
+ * All tests in this suite require a user.
*/
public void setUp() throws Exception {
- testUser = new UserData();
- testUser.setUserName("testUser");
- testUser.setPassword("password");
- testUser.setFullName("Test User");
- testUser.setEmailAddress("[EMAIL PROTECTED]");
- testUser.setLocale("en_US");
- testUser.setTimeZone("America/Los_Angeles");
- testUser.setDateCreated(new java.util.Date());
- testUser.setEnabled(Boolean.TRUE);
-
- testWeblog1 = new WebsiteData();
- testWeblog1.setName("Test Weblog 1");
- testWeblog1.setDescription("Test Weblog 1");
- testWeblog1.setHandle("testweblog1");
- testWeblog1.setEmailAddress("[EMAIL PROTECTED]");
- testWeblog1.setEditorPage("editor-text.jsp");
- testWeblog1.setBlacklist("");
- testWeblog1.setEmailFromAddress("");
- testWeblog1.setEditorTheme("basic");
- testWeblog1.setLocale("en_US");
- testWeblog1.setTimeZone("America/Los_Angeles");
- testWeblog1.setDateCreated(new java.util.Date());
-
- testWeblog2 = new WebsiteData();
- testWeblog2.setName("Test Weblog 2");
- testWeblog2.setDescription("Test Weblog 2");
- testWeblog2.setHandle("testWeblog2");
- testWeblog2.setEmailAddress("[EMAIL PROTECTED]");
- testWeblog2.setEditorPage("editor-text.jsp");
- testWeblog2.setBlacklist("");
- testWeblog2.setEmailFromAddress("");
- testWeblog2.setEditorTheme("basic");
- testWeblog2.setLocale("en_US");
- testWeblog2.setTimeZone("America/Los_Angeles");
- testWeblog2.setDateCreated(new java.util.Date());
-
- // add test user
- UserManager mgr = RollerFactory.getRoller().getUserManager();
- mgr.addUser(testUser);
-
- log.debug("testUser id = "+testUser.getId());
+ try {
+ testUser = TestUtils.setupUser("weblogTestUser");
+ } catch (Exception ex) {
+ log.error(ex);
+ }
}
public void tearDown() throws Exception {
- log.debug("testUser id = "+testUser.getId());
-
- // remove test user
- UserManager mgr = RollerFactory.getRoller().getUserManager();
- UserData user = mgr.getUser(testUser.getUserName());
- mgr.removeUser(user);
- testUser = null;
+ try {
+ TestUtils.teardownUser(testUser.getId());
+ } catch (Exception ex) {
+ log.error(ex);
+ }
}
/**
- * Test basic persistence operations ... Create, Update, Delete
+ * Test basic persistence operations ... Create, Update, Delete.
*/
public void testWeblogCRUD() throws Exception {
UserManager mgr = RollerFactory.getRoller().getUserManager();
- UserData user = mgr.getUser(testUser.getUserName());
-
WebsiteData weblog = null;
+ WebsiteData testWeblog = new WebsiteData();
+ testWeblog.setName("Test Weblog");
+ testWeblog.setDescription("Test Weblog");
+ testWeblog.setHandle("testweblog");
+ testWeblog.setEmailAddress("[EMAIL PROTECTED]");
+ testWeblog.setEditorPage("editor-text.jsp");
+ testWeblog.setBlacklist("");
+ testWeblog.setEmailFromAddress("");
+ testWeblog.setEditorTheme("basic");
+ testWeblog.setLocale("en_US");
+ testWeblog.setTimeZone("America/Los_Angeles");
+ testWeblog.setDateCreated(new java.util.Date());
+ testWeblog.setCreator(testUser);
+
// make sure test weblog does not exist
- weblog = mgr.getWebsiteByHandle(testWeblog1.getHandle());
+ weblog = mgr.getWebsiteByHandle(testWeblog.getHandle());
assertNull(weblog);
// add test weblog
- testWeblog1.setCreator(user);
- mgr.createWebsite(testWeblog1);
+ mgr.createWebsite(testWeblog);
+ String id = testWeblog.getId();
// make sure test weblog exists
- weblog = mgr.getWebsiteByHandle(testWeblog1.getHandle());
+ weblog = null;
+ weblog = mgr.retrieveWebsite(id);
assertNotNull(weblog);
- assertEquals(testWeblog1.getHandle(), weblog.getHandle());
+ assertEquals(testWeblog, weblog);
// modify weblog and save
weblog.setName("testtesttest");
mgr.storeWebsite(weblog);
- weblog = null;
// make sure changes were saved
- weblog = mgr.getWebsiteByHandle(testWeblog1.getHandle());
+ weblog = null;
+ weblog = mgr.retrieveWebsite(id);
assertNotNull(weblog);
assertEquals("testtesttest", weblog.getName());
// remove test weblog
mgr.removeWebsite(weblog);
- weblog = null;
// make sure weblog no longer exists
- weblog = mgr.getWebsiteByHandle(testWeblog1.getHandle());
+ weblog = null;
+ weblog = mgr.retrieveWebsite(id);
assertNull(weblog);
}
/**
- * Test lookup mechanisms ... Id, Handle, User
+ * Test lookup mechanisms.
*/
public void testWeblogLookups() throws Exception {
UserManager mgr = RollerFactory.getRoller().getUserManager();
- UserData user = mgr.getUser(testUser.getUserName());
-
WebsiteData weblog = null;
- // make sure test weblog does not exist
- weblog = mgr.getWebsiteByHandle(testWeblog1.getHandle());
- assertNull(weblog);
-
// add test weblogs
- testWeblog1.setCreator(user);
- mgr.createWebsite(testWeblog1);
- String id1 = testWeblog1.getId();
- testWeblog2.setCreator(user);
- mgr.createWebsite(testWeblog2);
- String id2 = testWeblog2.getId();
+ WebsiteData testWeblog1 = TestUtils.setupWeblog("testWeblog1",
testUser);
+ WebsiteData testWeblog2 = TestUtils.setupWeblog("testWeblog2",
testUser);
// lookup by id
- weblog = mgr.retrieveWebsite(id1);
+ weblog = mgr.retrieveWebsite(testWeblog1.getId());
assertNotNull(weblog);
assertEquals(testWeblog1.getHandle(), weblog.getHandle());
@@ -198,7 +153,7 @@
// get all weblogs for user
weblog = null;
- List weblogs1 = mgr.getWebsites(user, Boolean.TRUE, Boolean.TRUE);
+ List weblogs1 = mgr.getWebsites(testUser, Boolean.TRUE, Boolean.TRUE);
assertEquals(2, weblogs1.size());
weblog = (WebsiteData) weblogs1.get(0);
assertNotNull(weblog);
@@ -206,7 +161,7 @@
// make sure disabled weblogs are not returned
weblog.setEnabled(Boolean.FALSE);
mgr.storeWebsite(weblog);
- List weblogs2 = mgr.getWebsites(user, Boolean.TRUE, Boolean.TRUE);
+ List weblogs2 = mgr.getWebsites(testUser, Boolean.TRUE, Boolean.TRUE);
assertEquals(1, weblogs2.size());
weblog = (WebsiteData) weblogs2.get(0);
assertNotNull(weblog);
@@ -214,15 +169,81 @@
// make sure inactive weblogs are not returned
weblog.setActive(Boolean.FALSE);
mgr.storeWebsite(weblog);
- List weblogs3 = mgr.getWebsites(user, Boolean.TRUE, Boolean.TRUE);
+ List weblogs3 = mgr.getWebsites(testUser, Boolean.TRUE, Boolean.TRUE);
assertEquals(0, weblogs3.size());
// remove test weblogs
- weblog = mgr.retrieveWebsite(id1);
- mgr.removeWebsite(weblog);
- weblog = mgr.retrieveWebsite(id2);
- mgr.removeWebsite(weblog);
- weblog = null;
+ TestUtils.teardownWeblog(testWeblog1.getId());
+ TestUtils.teardownWeblog(testWeblog2.getId());
+ }
+
+
+ /**
+ * Test advanced CRUD methods.
+ */
+ public void testAdvancedWeblogCRUD() throws Exception {
+
+ UserManager mgr = RollerFactory.getRoller().getUserManager();
+ List weblogs = null;
+
+ // some weblogs to test with
+ WebsiteData testWeblog1 = new WebsiteData();
+ testWeblog1.setName("Test Weblog 1");
+ testWeblog1.setDescription("Test Weblog 1");
+ testWeblog1.setHandle("testweblog1");
+ testWeblog1.setEmailAddress("[EMAIL PROTECTED]");
+ testWeblog1.setEditorPage("editor-text.jsp");
+ testWeblog1.setBlacklist("");
+ testWeblog1.setEmailFromAddress("");
+ testWeblog1.setEditorTheme("basic");
+ testWeblog1.setLocale("en_US");
+ testWeblog1.setTimeZone("America/Los_Angeles");
+ testWeblog1.setDateCreated(new java.util.Date());
+ testWeblog1.setCreator(testUser);
+
+ WebsiteData testWeblog2 = new WebsiteData();
+ testWeblog2.setName("Test Weblog 2");
+ testWeblog2.setDescription("Test Weblog 2");
+ testWeblog2.setHandle("testweblog2");
+ testWeblog2.setEmailAddress("[EMAIL PROTECTED]");
+ testWeblog2.setEditorPage("editor-text.jsp");
+ testWeblog2.setBlacklist("");
+ testWeblog2.setEmailFromAddress("");
+ testWeblog2.setEditorTheme("basic");
+ testWeblog2.setLocale("en_US");
+ testWeblog2.setTimeZone("America/Los_Angeles");
+ testWeblog2.setDateCreated(new java.util.Date());
+ testWeblog2.setCreator(testUser);
+
+ Collection newWeblogs = new ArrayList();
+ newWeblogs.add(testWeblog1);
+ newWeblogs.add(testWeblog2);
+
+ // add weblogs (collection)
+ mgr.addWebsites(newWeblogs);
+
+ // make sure weblogs were added
+ weblogs = null;
+ weblogs = mgr.getWebsites(null, null, null);
+ assertNotNull(weblogs);
+ assertEquals(2, weblogs.size());
+
+ // store weblogs (collection)
+ testWeblog1.setName("blahblah");
+ testWeblog2.setName("foofoo");
+ mgr.storeWebsites(newWeblogs);
+
+ // make sure weblogs were stored
+ weblogs = null;
+ weblogs = mgr.getWebsites(null, null, null);
+ assertNotNull(weblogs);
+ assertEquals(2, weblogs.size());
+ assertTrue(((WebsiteData)weblogs.get(0)).getName().equals("blahblah")
||
+ ((WebsiteData)weblogs.get(1)).getName().equals("blahblah"));
+
+ // remove weblogs (collection)
+ TestUtils.teardownWeblog(testWeblog1.getId());
+ TestUtils.teardownWeblog(testWeblog2.getId());
}
