Index: /Users/trentbartlem/Documents/workspace/appfuse/service/src/test/java/org/appfuse/service/impl/LookupManagerImplTest.java
===================================================================
--- /Users/trentbartlem/Documents/workspace/appfuse/service/src/test/java/org/appfuse/service/impl/LookupManagerImplTest.java	(revision 2816)
+++ /Users/trentbartlem/Documents/workspace/appfuse/service/src/test/java/org/appfuse/service/impl/LookupManagerImplTest.java	(working copy)
@@ -30,7 +30,5 @@
 
         List<LabelValue> roles = mgr.getAllRoles();
         assertTrue(roles.size() > 0);
-        // verify expectations
-        lookupDao.verify();
     }
 }
Index: /Users/trentbartlem/Documents/workspace/appfuse/service/src/test/java/org/appfuse/service/impl/UniversalManagerTest.java
===================================================================
--- /Users/trentbartlem/Documents/workspace/appfuse/service/src/test/java/org/appfuse/service/impl/UniversalManagerTest.java	(revision 2816)
+++ /Users/trentbartlem/Documents/workspace/appfuse/service/src/test/java/org/appfuse/service/impl/UniversalManagerTest.java	(working copy)
@@ -4,6 +4,7 @@
 import org.appfuse.model.User;
 import org.jmock.Mock;
 import org.springframework.orm.ObjectRetrievalFailureException;
+import org.springframework.test.AssertThrows;
 
 /**
  * This class tests the generic UniversalManager and UniversalManagerImpl implementation.
@@ -26,36 +27,27 @@
     /**
      * Simple test to verify BaseDao works.
      */
-    public void testCRUD() {
-        User user = new User();
-        // set required fields
-        user.setUsername("foo");
-
-        // create
-        // set expectations
+    
+    public void testCreate() {
+        User user = createUser();
         dao.expects(once()).method("save").will(returnValue(user));
-        
         user = (User)manager.save(user);
-        dao.verify();
-        
-        // retrieve
-        dao.reset();
-        // expectations
+    }
+    
+    public void testRetrieve() {
+        User user = createUser();
         dao.expects(once()).method("get").will(returnValue(user));
-        
         user = (User) manager.get(User.class, user.getUsername());
-        dao.verify();
-        
-        // update
-        dao.reset();
+    }
+    
+    public void testUpdate() {
+        User user = createUser();
         dao.expects(once()).method("save").isVoid();
         user.getAddress().setCountry("USA");
         user = (User)manager.save(user);
-        dao.verify();
-        
-        // delete
-        dao.reset();
-        // expectations
+    }
+    
+    public void testDelete() {
         Exception ex = new ObjectRetrievalFailureException(User.class, "foo");
         dao.expects(once()).method("remove").isVoid();            
         dao.expects(once()).method("get").will(throwException(ex));
@@ -60,12 +52,17 @@
         dao.expects(once()).method("remove").isVoid();            
         dao.expects(once()).method("get").will(throwException(ex));
         manager.remove(User.class, "foo");
-        try {
-            manager.get(User.class, "foo");
-            fail("User 'foo' found in database");
-        } catch (ObjectRetrievalFailureException e) {
-            assertNotNull(e.getMessage());
-        }
-        dao.verify();
+        new AssertThrows(ObjectRetrievalFailureException.class) {
+            public void test() {
+                manager.get(User.class, "foo");
+            }
+        }.runTest();
+    }
+    
+    private User createUser() {
+        User user = new User();
+        // set required fields
+        user.setUsername("foo");
+        return user;
     }
 }
Index: /Users/trentbartlem/Documents/workspace/appfuse/service/src/test/java/org/appfuse/service/impl/UserManagerImplTest.java
===================================================================
--- /Users/trentbartlem/Documents/workspace/appfuse/service/src/test/java/org/appfuse/service/impl/UserManagerImplTest.java	(revision 2816)
+++ /Users/trentbartlem/Documents/workspace/appfuse/service/src/test/java/org/appfuse/service/impl/UserManagerImplTest.java	(working copy)
@@ -8,6 +8,7 @@
 import org.appfuse.service.UserExistsException;
 import org.jmock.Mock;
 import org.springframework.dao.DataIntegrityViolationException;
+import org.springframework.test.AssertThrows;
 
 
 public class UserManagerImplTest extends BaseManagerMockTestCase {
@@ -37,7 +38,6 @@
         User user = userManager.getUser("1");
         assertTrue(user != null);
         assertTrue(user.getRoles().size() == 1);
-        userDao.verify();
     }
 
     public void testSaveUser() throws Exception {
@@ -49,10 +49,7 @@
         
         User user = userManager.getUser("1");
         user.setPhoneNumber("303-555-1212");
-        userDao.verify();
-        
-        // reset expectations
-        userDao.reset();
+
         userDao.expects(once()).method("saveUser").with(same(user)).will(returnValue(user));
         
         user = userManager.saveUser(user);
@@ -58,7 +55,6 @@
         user = userManager.saveUser(user);
         assertTrue(user.getPhoneNumber().equals("303-555-1212"));
         assertTrue(user.getRoles().size() == 1);
-        userDao.verify();
     }
 
     public void testAddAndRemoveUser() throws Exception {
@@ -73,7 +69,6 @@
                .with(eq("ROLE_USER")).will(returnValue(new Role("ROLE_USER")));
         
         Role role = roleManager.getRole(Constants.USER_ROLE);
-        roleDao.verify();
         user.addRole(role);
 
         // set expected behavior on user dao
@@ -82,21 +77,13 @@
         user = userManager.saveUser(user);
         assertTrue(user.getUsername().equals("john"));
         assertTrue(user.getRoles().size() == 1);
-        userDao.verify();
-        
-        // reset expectations
-        userDao.reset();
         
         userDao.expects(once()).method("remove").with(eq(5L));
         userManager.removeUser("5");
-        userDao.verify();
 
-        // reset expectations
-        userDao.reset();
         userDao.expects(once()).method("get").will(returnValue(null));
         user = userManager.getUser("5");
         assertNull(user);
-        userDao.verify();
     }
     
     public void testUserExistsException() {
@@ -109,12 +96,10 @@
                .will(throwException(ex));
         
         // run test
-        try {
-            userManager.saveUser(user);
-            fail("Expected UserExistsException not thrown");
-        } catch (UserExistsException e) {
-            log.debug("expected exception: " + e.getMessage());
-            assertNotNull(e);
-        }
+        new AssertThrows(UserExistsException.class) {
+            public void test() {
+                user = userManager.saveUser(user);
+            }
+        }.runTest();
     }
 }
Index: /Users/trentbartlem/Documents/workspace/appfuse/service/src/test/java/org/appfuse/service/UserSecurityAdviceTest.java
===================================================================
--- /Users/trentbartlem/Documents/workspace/appfuse/service/src/test/java/org/appfuse/service/UserSecurityAdviceTest.java	(revision 2816)
+++ /Users/trentbartlem/Documents/workspace/appfuse/service/src/test/java/org/appfuse/service/UserSecurityAdviceTest.java	(working copy)
@@ -14,6 +14,7 @@
 import org.jmock.MockObjectTestCase;
 import org.springframework.context.ApplicationContext;
 import org.springframework.context.support.ClassPathXmlApplicationContext;
+import org.springframework.test.AssertThrows;
 
 public class UserSecurityAdviceTest extends MockObjectTestCase {
     Mock userDao = null;
@@ -50,13 +51,11 @@
         User user = new User("admin");
         user.setId(2L);
 
-        try {
-            userManager.saveUser(user);
-            fail("AccessDeniedException not thrown");
-        } catch (AccessDeniedException expected) {
-            assertNotNull(expected);
-            assertEquals(expected.getMessage(), UserSecurityAdvice.ACCESS_DENIED);
-        }
+        new AssertThrows(AccessDeniedException.class) {
+            public void test() {
+                user = userManager.saveUser(user);
+            }
+        }.runTest();
     }
 
     public void testAddUserAsAdmin() throws Exception {
@@ -76,8 +75,7 @@
         adminUser.setId(2L);
 
         userDao.expects(once()).method("saveUser");
-        userManager.saveUser(adminUser);
-        userDao.verify();
+        user = userManager.saveUser(adminUser);
     }
 
     public void testUpdateUserProfile() throws Exception {
@@ -87,8 +85,7 @@
         user.getRoles().add(new Role(Constants.USER_ROLE));
 
         userDao.expects(once()).method("saveUser");
-        userManager.saveUser(user);
-        userDao.verify();
+        user = userManager.saveUser(user);
     }
 
     // Test fix to http://issues.appfuse.org/browse/APF-96
@@ -98,13 +95,11 @@
         user.setId(1L);
         user.getRoles().add(new Role(Constants.ADMIN_ROLE));
 
-        try {
-            userManager.saveUser(user);
-            fail("AccessDeniedException not thrown");
-        } catch (AccessDeniedException expected) {
-            assertNotNull(expected);
-            assertEquals(expected.getMessage(), UserSecurityAdvice.ACCESS_DENIED);
-        }
+        new AssertThrows(AccessDeniedException.class) {
+            public void test() {
+                user = userManager.saveUser(user);
+            }
+        }.runTest();
     }
 
     // Test fix to http://issues.appfuse.org/browse/APF-96
@@ -114,14 +109,12 @@
         user.setId(1L);
         user.getRoles().add(new Role(Constants.ADMIN_ROLE));
         user.getRoles().add(new Role(Constants.USER_ROLE));
-
-        try {
-            userManager.saveUser(user);
-            fail("AccessDeniedException not thrown");
-        } catch (AccessDeniedException expected) {
-            assertNotNull(expected);
-            assertEquals(expected.getMessage(), UserSecurityAdvice.ACCESS_DENIED);
-        }
+        
+        new AssertThrows(AccessDeniedException.class) {
+            public void test() {
+                user = userManager.saveUser(user);
+            }
+        }.runTest();
     }
 
     // Test fix to http://issues.appfuse.org/browse/APF-96
@@ -144,8 +137,7 @@
         user.getRoles().add(new Role(Constants.USER_ROLE));
 
         userDao.expects(once()).method("saveUser");
-        userManager.saveUser(user);
-        userDao.verify();
+        user = userManager.saveUser(user);
     }
 
     // Test fix to http://issues.appfuse.org/browse/APF-96
@@ -156,8 +148,7 @@
         user.getRoles().add(new Role(Constants.USER_ROLE));
 
         userDao.expects(once()).method("saveUser");
-        userManager.saveUser(user);
-        userDao.verify();
+        user = userManager.saveUser(user);
     }
 
     private UserManager makeInterceptedTarget() {