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/02/27 22:15:26 UTC
svn commit: r512410 - in
/incubator/roller/branches/roller_4.0/tests/org/apache/roller/business:
CommentTest.java WeblogEntryTest.java WeblogTest.java
Author: snoopdave
Date: Tue Feb 27 13:15:25 2007
New Revision: 512410
URL: http://svn.apache.org/viewvc?view=rev&rev=512410
Log:
- Ensure that TestUtils.endSession(true) is run at end of every test
- Fixing a couple of test bugs
Tests now pass 100% with Toplink/MySQL
Modified:
incubator/roller/branches/roller_4.0/tests/org/apache/roller/business/CommentTest.java
incubator/roller/branches/roller_4.0/tests/org/apache/roller/business/WeblogEntryTest.java
incubator/roller/branches/roller_4.0/tests/org/apache/roller/business/WeblogTest.java
Modified: incubator/roller/branches/roller_4.0/tests/org/apache/roller/business/CommentTest.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/tests/org/apache/roller/business/CommentTest.java?view=diff&rev=512410&r1=512409&r2=512410
==============================================================================
--- incubator/roller/branches/roller_4.0/tests/org/apache/roller/business/CommentTest.java (original)
+++ incubator/roller/branches/roller_4.0/tests/org/apache/roller/business/CommentTest.java Tue Feb 27 13:15:25 2007
@@ -206,54 +206,62 @@
log.info("BEGIN");
- WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
- UserManager umgr = RollerFactory.getRoller().getUserManager();
-
- // first make sure we can delete an entry with comments
- UserData user = TestUtils.setupUser("commentParentDeleteUser");
- WebsiteData weblog = TestUtils.setupWeblog("commentParentDelete", user);
- WeblogEntryData entry = TestUtils.setupWeblogEntry("CommentParentDeletes1", weblog.getDefaultCategory(), weblog, user);
-
- CommentData comment1 = TestUtils.setupComment("comment1", entry);
- CommentData comment2 = TestUtils.setupComment("comment2", entry);
- CommentData comment3 = TestUtils.setupComment("comment3", entry);
- TestUtils.endSession(true);
-
- // now deleting the entry should succeed and delete all comments
- Exception ex = null;
try {
- wmgr.removeWeblogEntry(TestUtils.getManagedWeblogEntry(entry));
+ WeblogManager wmgr = RollerFactory.getRoller().getWeblogManager();
+ UserManager umgr = RollerFactory.getRoller().getUserManager();
+
+ // first make sure we can delete an entry with comments
+ UserData user = TestUtils.setupUser("commentParentDeleteUser");
+ WebsiteData weblog = TestUtils.setupWeblog("commentParentDelete", user);
+ WeblogEntryData entry = TestUtils.setupWeblogEntry("CommentParentDeletes1", weblog.getDefaultCategory(), weblog, user);
+
+ CommentData comment1 = TestUtils.setupComment("comment1", entry);
+ CommentData comment2 = TestUtils.setupComment("comment2", entry);
+ CommentData comment3 = TestUtils.setupComment("comment3", entry);
TestUtils.endSession(true);
- } catch (RollerException e) {
- ex = e;
- }
- assertNull(ex);
-
- // now make sure we can delete a weblog with comments
- weblog = TestUtils.getManagedWebsite(weblog);
- entry = TestUtils.setupWeblogEntry("CommentParentDeletes2", weblog.getDefaultCategory(), weblog, user);
-
- comment1 = TestUtils.setupComment("comment1", entry);
- comment2 = TestUtils.setupComment("comment2", entry);
- comment3 = TestUtils.setupComment("comment3", entry);
- TestUtils.endSession(true);
-
- // now deleting the entry should succeed and delete all comments
- ex = null;
- try {
- umgr.removeWebsite(TestUtils.getManagedWebsite(weblog));
+
+ // now deleting the entry should succeed and delete all comments
+ Exception ex = null;
+ try {
+ wmgr.removeWeblogEntry(TestUtils.getManagedWeblogEntry(entry));
+ TestUtils.endSession(true);
+ } catch (RollerException e) {
+ ex = e;
+ }
+ assertNull(ex);
+
+ // now make sure we can delete a weblog with comments
+ weblog = TestUtils.getManagedWebsite(weblog);
+ user = TestUtils.getManagedUser(user);
+ entry = TestUtils.setupWeblogEntry("CommentParentDeletes2", weblog.getDefaultCategory(), weblog, user);
+
+ comment1 = TestUtils.setupComment("comment1", entry);
+ comment2 = TestUtils.setupComment("comment2", entry);
+ comment3 = TestUtils.setupComment("comment3", entry);
+ TestUtils.endSession(true);
+
+ // now deleting the entry should succeed and delete all comments
+ ex = null;
+ try {
+ umgr.removeWebsite(TestUtils.getManagedWebsite(weblog));
+ TestUtils.endSession(true);
+ } catch (RollerException e) {
+ PrintWriter pw = new PrintWriter(new StringWriter());
+ e.printStackTrace(pw);
+ log.info(pw.toString());
+ ex = e;
+ }
+ assertNull(ex);
+
+ // and delete test user as well
+ umgr.removeUser(TestUtils.getManagedUser(user));
+
+ } catch(Throwable t) {
+ log.error("Exception running test", t);
+ throw (Exception) t;
+ } finally {
TestUtils.endSession(true);
- } catch (RollerException e) {
- PrintWriter pw = new PrintWriter(new StringWriter());
- e.printStackTrace(pw);
- log.info(pw.toString());
- ex = e;
}
- assertNull(ex);
-
- // and delete test user as well
- umgr.removeUser(user);
- TestUtils.endSession(true);
log.info("END");
}
Modified: incubator/roller/branches/roller_4.0/tests/org/apache/roller/business/WeblogEntryTest.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/tests/org/apache/roller/business/WeblogEntryTest.java?view=diff&rev=512410&r1=512409&r2=512410
==============================================================================
--- incubator/roller/branches/roller_4.0/tests/org/apache/roller/business/WeblogEntryTest.java (original)
+++ incubator/roller/branches/roller_4.0/tests/org/apache/roller/business/WeblogEntryTest.java Tue Feb 27 13:15:25 2007
@@ -943,7 +943,9 @@
TestUtils.teardownWeblog(blog2.getId());
TestUtils.teardownWeblog(blog3.getId());
- TestUtils.teardownUser(user1.getId());
+ TestUtils.teardownUser(user1.getId());
+
+ TestUtils.endSession(true);
}
}
}
Modified: incubator/roller/branches/roller_4.0/tests/org/apache/roller/business/WeblogTest.java
URL: http://svn.apache.org/viewvc/incubator/roller/branches/roller_4.0/tests/org/apache/roller/business/WeblogTest.java?view=diff&rev=512410&r1=512409&r2=512410
==============================================================================
--- incubator/roller/branches/roller_4.0/tests/org/apache/roller/business/WeblogTest.java (original)
+++ incubator/roller/branches/roller_4.0/tests/org/apache/roller/business/WeblogTest.java Tue Feb 27 13:15:25 2007
@@ -156,14 +156,15 @@
public void testWeblogLookups() throws Exception {
log.info("BEGIN");
-
+ WebsiteData testWeblog1 = null;
+ WebsiteData testWeblog2 = null;
try {
UserManager mgr = RollerFactory.getRoller().getUserManager();
WebsiteData weblog = null;
// add test weblogs
- WebsiteData testWeblog1 = TestUtils.setupWeblog("testWeblog1", TestUtils.getManagedUser(testUser));
- WebsiteData testWeblog2 = TestUtils.setupWeblog("testWeblog2", TestUtils.getManagedUser(testUser));
+ testWeblog1 = TestUtils.setupWeblog("testWeblog1", testUser);
+ testWeblog2 = TestUtils.setupWeblog("testWeblog2", testUser);
TestUtils.endSession(true);
// lookup by id
@@ -205,7 +206,7 @@
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, weblogs11.size());
+ assertEquals(1, weblogs12.size());
// make sure disabled weblogs are not returned
weblog.setEnabled(Boolean.FALSE);
@@ -223,13 +224,13 @@
List weblogs3 = mgr.getWebsites(TestUtils.getManagedUser(testUser), Boolean.TRUE, Boolean.TRUE, null, null, 0, -1);
assertEquals(0, weblogs3.size());
- // remove test weblogs
- TestUtils.teardownWeblog(testWeblog1.getId());
- TestUtils.teardownWeblog(testWeblog2.getId());
- TestUtils.endSession(true);
} catch(Throwable t) {
log.error("Exception running test", t);
throw (Exception) t;
+ } finally {
+ TestUtils.teardownWeblog(testWeblog1.getId());
+ TestUtils.teardownWeblog(testWeblog2.getId());
+ TestUtils.endSession(true);
}
log.info("END");