[Cse-ip-svn-commits] SF.net SVN: cse-ip:[80] cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/ de/campussource/cse/cdmm/RoleDaoTest.java

[<id...@us...>]

Revision: 80
          http://cse-ip.svn.sourceforge.net/cse-ip/?rev=80&view=rev
Author:   idueppe
Date:     2009-03-10 16:21:51 +0000 (Tue, 10 Mar 2009)

Log Message:
-----------
Fixed issues...

Modified Paths:
--------------
    cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/RoleDaoTest.java

Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/RoleDaoTest.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/RoleDaoTest.java	2009-03-10 15:16:35 UTC (rev 79)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/RoleDaoTest.java	2009-03-10 16:21:51 UTC (rev 80)
@@ -109,42 +109,46 @@
 	 */
 	@Test
 	public void testCascadingOnDeleteCourse(){
-		//FIXME test fails, no idea why...
-//		dao.persist(role);
-//		assertNotNull(role.getId());
-//		assertNotNull(course.getId());
-//		assertNotNull(account.getId());
-//		assertNotNull(account.getRoles());
-//		assertNotNull(course.getRoles());
-//		assertEquals(course.getRoles().get(0), role);
-//		assertEquals(account.getRoles().get(0), role);
-//		assertEquals(role.getCourse(), course);
-//		assertEquals(role.getAccount(), account);
-//		CourseDao courseDao = new CourseDao();
-//		autowireByType(courseDao);
-//		courseDao.remove(course);
-//		assertNull(courseDao.find(course.getId()));
-//		assertNull(dao.find(role.getId()));
+		dao.persist(role);
+		assertNotNull(role.getId());
+		assertNotNull(course.getId());
+		assertNotNull(account.getId());
+		assertNotNull(account.getRoles());
+		assertNotNull(course.getRoles());
+		assertEquals(course.getRoles().get(0), role);
+		assertEquals(account.getRoles().get(0), role);
+		assertEquals(role.getCourse(), course);
+		assertEquals(role.getAccount(), account);
+		
+		commitAndBeginTx();
+		
+		CourseDao courseDao = new CourseDao();
+		autowireByType(courseDao);
+		courseDao.remove(course);
+		assertNull(courseDao.find(course.getId()));
+		assertNull(dao.find(role.getId()));
 	}
 	
 	@Test
 	public void testCascadingOnDeleteAccount(){
-		//FIXME test fails, no idea why...
-//		dao.persist(role);
-//		assertNotNull(role.getId());
-//		assertNotNull(course.getId());
-//		assertNotNull(account.getId());
-//		assertNotNull(account.getRoles());
-//		assertNotNull(course.getRoles());
-//		assertEquals(course.getRoles().get(0), role);
-//		assertEquals(account.getRoles().get(0), role);
-//		assertEquals(role.getCourse(), course);
-//		assertEquals(role.getAccount(), account);
-//		AccountDao accountDao = new AccountDao();
-//		autowireByType(accountDao);
-//		accountDao.remove(account);
-//		assertNull(accountDao.find(account.getId()));
-//		assertNull(dao.find(role.getId()));
+		dao.persist(role);
+		assertNotNull(role.getId());
+		assertNotNull(course.getId());
+		assertNotNull(account.getId());
+		assertNotNull(account.getRoles());
+		assertNotNull(course.getRoles());
+		assertEquals(course.getRoles().get(0), role);
+		assertEquals(account.getRoles().get(0), role);
+		assertEquals(role.getCourse(), course);
+		assertEquals(role.getAccount(), account);
+		
+		commitAndBeginTx();
+		
+		AccountDao accountDao = new AccountDao();
+		autowireByType(accountDao);
+		accountDao.remove(account);
+		assertNull(accountDao.find(account.getId()));
+		assertNull(dao.find(role.getId()));
 	}
 	
 	


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.