[Openuss-svn-commits] SF.net SVN: openuss:[4814] branches/openuss-plexus-3.1/plexus/plexus-core/ src/test/java/org/openuss

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

Revision: 4814
          http://openuss.svn.sourceforge.net/openuss/?rev=4814&view=rev
Author:   idueppe
Date:     2008-10-05 12:59:05 +0000 (Sun, 05 Oct 2008)

Log Message:
-----------
bug fixing - period test date was static and outdated

Modified Paths:
--------------
    branches/openuss-plexus-3.1/plexus/plexus-core/src/test/java/org/openuss/TestUtility.java
    branches/openuss-plexus-3.1/plexus/plexus-core/src/test/java/org/openuss/lecture/UniversityServiceIntegrationTest.java
    branches/openuss-plexus-3.1/plexus/plexus-core/src/test/java/org/openuss/security/acegi/ldap/ConfigurableLdapAuthenticationProviderTest.java

Modified: branches/openuss-plexus-3.1/plexus/plexus-core/src/test/java/org/openuss/TestUtility.java
===================================================================
--- branches/openuss-plexus-3.1/plexus/plexus-core/src/test/java/org/openuss/TestUtility.java	2008-10-05 08:42:59 UTC (rev 4813)
+++ branches/openuss-plexus-3.1/plexus/plexus-core/src/test/java/org/openuss/TestUtility.java	2008-10-05 12:59:05 UTC (rev 4814)
@@ -81,27 +81,6 @@
 
 	private Institute defaultInstitute;
 
-	// /**
-	// * @deprecated As of OpenUSS 3.0 RC1, replaced by
-	// <code>TestUtility.createUniqueUserInDB()</code>.
-	// */
-	// public User createDefaultUserInDB() {
-	// defaultUser.setUsername(unique(USERNAME));
-	// defaultUser.setGroups(new ArrayList<Group>());
-	// userDao.create(defaultUser);
-	// return defaultUser;
-	// }
-
-	// /**
-	// * @deprecated As of OpenUSS 3.0 RC1, replaced by
-	// <code>TestUtility.createUniqueUserInDB()</code>.
-	// */
-	// public User createUserInDB() {
-	// User user = createDefaultUser();
-	// userDao.create(user);
-	// return user;
-	// }
-
 	public void removeDefaultUser() {
 		removeUser(defaultUser);
 	}
@@ -115,29 +94,6 @@
 		userDao.remove(user);
 	}
 
-	// /**
-	// * @deprecated As of OpenUSS 3.0 RC1, replaced by
-	// <code>TestUtility.createUniqueInstituteInDB()</code>.
-	// */
-	// public Institute createPersistInstituteWithDefaultUser() {
-	// defaultUser.setUsername(unique(USERNAME));
-	// defaultUser.setFirstName("firstName");
-	// defaultUser.setLastName("lastName");
-	// defaultUser.setTitle("title");
-	// defaultUser.setEmail(unique("email"));
-	// defaultUser.setLocale("de_DE");
-	//		
-	// userDao.create(defaultUser);
-	// defaultInstitute.setName(unique("name"));
-	// defaultInstitute.setShortcut(unique("shortcut"));
-	// defaultInstitute.setEmail(unique("email"));
-	// defaultInstitute.setLocale("de_DE");
-	// defaultInstitute.setOwnerName("owner name");
-	// defaultInstitute.setMembership(Membership.Factory.newInstance());
-	// instituteDao.create(defaultInstitute);
-	// return defaultInstitute;
-	// }
-
 	public User createUniqueUserInDB() {
 		User user = createUniqueUser();
 		userDao.create(user);
@@ -491,7 +447,7 @@
 
 		// Create a unique CourseType and Period
 		CourseType courseType = this.createUniqueCourseTypeInDB();
-		Period period = this.createUniquePeriodInDB(courseType.getInstitute().getDepartment().getUniversity());
+		Period period = this.createUniqueActivePeriodInDB(courseType.getInstitute().getDepartment().getUniversity());
 
 		// Create a unique CourseType
 		Course course = Course.Factory.newInstance();
@@ -522,48 +478,18 @@
 		return course;
 	}
 
-	public Period createUniquePeriodInDB(University university) {
-
+	public Period createUniqueActivePeriodInDB(University university) {
 		// Create Startdate
-		Calendar cal = new GregorianCalendar();
-		cal.set(2007, 3, 1);
-		Date startdate = new Date(cal.getTimeInMillis());
-
+		Date startdate = new Date(System.currentTimeMillis() - 1000*60*60*24*60);
 		// Create Enddate
-		cal = new GregorianCalendar();
-		cal.set(2008, 8, 31);
-		Date enddate = new Date(cal.getTimeInMillis());
+		Date enddate = new Date(System.currentTimeMillis() + 1000*60*60*24*60);
 
-		// Create a unique Period
-		Period period = Period.Factory.newInstance();
-		period.setName(unique("Period"));
-		period.setDescription("A unique Period");
-		period.setCourses(new ArrayList<Course>());
-		period.setStartdate(startdate);
-		period.setEnddate(enddate);
-		period.setDefaultPeriod(false);
-		university.add(period);
+		Period period = associatePeriodToUniversity(university, startdate, enddate);
 
-		periodDao.create(period);
-		this.getSecurityService().createObjectIdentity(period, university);
-
 		return period;
 	}
 
-	public Period createUniquePeriodInDB() {
-		// Create University
-		University university = this.createUniqueUniversityInDB();
-
-		// Create Startdate
-		Calendar cal = new GregorianCalendar();
-		cal.set(2007, 3, 1);
-		Date startdate = new Date(cal.getTimeInMillis());
-
-		// Create Enddate
-		cal = new GregorianCalendar();
-		cal.set(2008, 8, 31);
-		Date enddate = new Date(cal.getTimeInMillis());
-
+	private Period associatePeriodToUniversity(University university, Date startdate, Date enddate) {
 		// Create a unique Period
 		Period period = Period.Factory.newInstance();
 		period.setName(unique("Period"));
@@ -580,32 +506,20 @@
 		return period;
 	}
 
+	public Period createUniquePeriodInDB() {
+		return createUniqueActivePeriodInDB(this.createUniqueUniversityInDB());
+	}
+
 	public Period createUniqueInactivePeriodInDB() {
 		// Create a unique University
 		University university = this.createUniqueUniversityInDB();
-
 		// Create Startdate
-		Calendar cal = new GregorianCalendar();
-		cal.set(2005, 3, 1);
-		Date startdate = new Date(cal.getTimeInMillis());
-
+		Date startdate = new Date(System.currentTimeMillis() - 1000*60*60*24*120);
 		// Create Enddate
-		cal = new GregorianCalendar();
-		cal.set(2006, 8, 31);
-		Date enddate = new Date(cal.getTimeInMillis());
+		Date enddate = new Date(System.currentTimeMillis() - 1000*60*60*24*2);
 
-		// Create a unique Period
-		Period period = Period.Factory.newInstance();
-		period.setName(unique("Period"));
-		period.setDescription("A unique Period");
-		period.setCourses(new ArrayList<Course>());
-		period.setStartdate(startdate);
-		period.setEnddate(enddate);
-		period.setDefaultPeriod(false);
-		university.add(period);
+		Period period = associatePeriodToUniversity(university, startdate, enddate);
 
-		periodDao.create(period);
-
 		return period;
 	}
 
@@ -633,19 +547,6 @@
 		// userDao.remove(defaultInstitute.getOwner());
 	}
 
-	// /**
-	// * @deprecated As of OpenUSS 3.0 RC1, replaced by
-	// <code>TestUtility.createUniqueInstituteInDB()</code>.
-	// */
-	// public Institute createdDefaultInstituteWithStoredUser() {
-	// defaultUser.setUsername(unique(USERNAME));
-	// userDao.create(defaultUser);
-	// defaultInstitute.setName(unique("name"));
-	// defaultInstitute.setShortcut(unique("shortcut"));
-	// instituteDao.create(defaultInstitute);
-	// return defaultInstitute;
-	// }
-
 	public User createAnonymousSecureContext() {
 		return createSecureContext(Roles.ANONYMOUS_ID);
 	}
@@ -689,24 +590,6 @@
 		return user;
 	}
 
-	// /**
-	// * @deprecated As of OpenUSS 3.0 RC1, replaced by
-	// <code>TestUtility.createUniqueUser()</code>.
-	// */
-	// public User createDefaultUser() {
-	// User user = User.Factory.newInstance();
-	// user.setUsername(unique(USERNAME));
-	// user.setFirstName("firstName");
-	// user.setLastName("lastName");
-	// user.setPassword("password");
-	// user.setEmail(unique("email"));
-	// user.setEnabled(true);
-	// user.setAccountExpired(true);
-	// user.setCredentialsExpired(true);
-	// user.setAccountLocked(true);
-	// return user;
-	// }
-
 	private static volatile long uniqueId = System.currentTimeMillis();
 
 	public static synchronized long unique() {

Modified: branches/openuss-plexus-3.1/plexus/plexus-core/src/test/java/org/openuss/lecture/UniversityServiceIntegrationTest.java
===================================================================
--- branches/openuss-plexus-3.1/plexus/plexus-core/src/test/java/org/openuss/lecture/UniversityServiceIntegrationTest.java	2008-10-05 08:42:59 UTC (rev 4813)
+++ branches/openuss-plexus-3.1/plexus/plexus-core/src/test/java/org/openuss/lecture/UniversityServiceIntegrationTest.java	2008-10-05 12:59:05 UTC (rev 4814)
@@ -240,7 +240,7 @@
 
 		// Create a Period
 		University universityTest = testUtility.createUniqueUniversityInDB();
-		Period period = testUtility.createUniquePeriodInDB(universityTest);
+		Period period = testUtility.createUniqueActivePeriodInDB(universityTest);
 		assertNotNull(period.getId());
 
 		// Get University
@@ -286,7 +286,7 @@
 
 		// Create a Period
 		University universityTest = testUtility.createUniqueUniversityInDB();
-		Period period = testUtility.createUniquePeriodInDB(universityTest);
+		Period period = testUtility.createUniqueActivePeriodInDB(universityTest);
 		assertNotNull(period.getId());
 
 		// Save UniversityID
@@ -332,7 +332,7 @@
 
 		// Create a Period
 		University universityTest = testUtility.createUniqueUniversityInDB();
-		Period period = testUtility.createUniquePeriodInDB(universityTest);
+		Period period = testUtility.createUniqueActivePeriodInDB(universityTest);
 		assertNotNull(period.getId());
 
 		// Synchronize with Database
@@ -346,7 +346,6 @@
 		logger.info("----> END access to findPeriod test");
 	}
 
-	@SuppressWarnings( { "unchecked" })
 	public void testFindAllUniversities() {
 		logger.info("----> BEGIN access to findAllUniversities test");
 
@@ -388,7 +387,6 @@
 		logger.info("----> END access to findAllUniversities test");
 	}
 
-	@SuppressWarnings( { "unchecked" })
 	public void testFindPeriodsByUniversity() {
 		logger.info("----> BEGIN access to findPeriodsByUniversity test");
 
@@ -399,9 +397,9 @@
 		int sizeBefore = university.getPeriods().size();
 
 		// Create Periods with university
-		Period period1 = testUtility.createUniquePeriodInDB(university);
+		Period period1 = testUtility.createUniqueActivePeriodInDB(university);
 
-		Period period2 = testUtility.createUniquePeriodInDB(university);
+		Period period2 = testUtility.createUniqueActivePeriodInDB(university);
 		
 		Period period3 = testUtility.createUniqueInactivePeriodInDB();
 		period3.setUniversity(university);
@@ -420,7 +418,6 @@
 		logger.info("----> END access to findPeriodsByUniversity test");
 	}
 
-	@SuppressWarnings( { "unchecked" })
 	public void testFindPeriodsByUniversityAndActivation() {
 		logger.info("----> BEGIN access to findActivePeriodByUniversity test");
 
@@ -439,9 +436,9 @@
 		int passiveSizeBefore = passivePeriods.size();
 		
 		// Create Periods with university
-		Period period1 = testUtility.createUniquePeriodInDB(university);
+		Period period1 = testUtility.createUniqueActivePeriodInDB(university);
 
-		Period period2 = testUtility.createUniquePeriodInDB(university);
+		Period period2 = testUtility.createUniqueActivePeriodInDB(university);
 
 		Period period3 = testUtility.createUniqueInactivePeriodInDB();
 		period3.setUniversity(university);
@@ -453,20 +450,17 @@
 		periodDao.update(period3);
 
 		// Test
-		List<PeriodInfo> periodInfos = this.getUniversityService().
-			findPeriodsByUniversityAndActivation(university.getId(), true);
+		List<PeriodInfo> periodInfos = this.getUniversityService().findPeriodsByUniversityAndActivation(university.getId(), true);
 		assertNotNull(periodInfos);
 		assertEquals(sizeBefore+2, periodInfos.size());
 		
-		periodInfos = this.getUniversityService().
-			findPeriodsByUniversityAndActivation(university.getId(), false);
+		periodInfos = this.getUniversityService().findPeriodsByUniversityAndActivation(university.getId(), false);
 		assertNotNull(periodInfos);
 		assertEquals(passiveSizeBefore+1, periodInfos.size());
 
 		logger.info("----> END access to findActivePeriodByUniversity test");
 	}
 
-	@SuppressWarnings( { "unchecked" })
 	public void testFindUniversitiesByUserAndEnabled() {
 		logger.info("----> BEGIN access to findUniversitiesByUser test");
 
@@ -496,7 +490,6 @@
 		logger.info("----> END access to findUniversitiesByUser test");
 	}
 
-	@SuppressWarnings( { "unchecked" })
 	public void testFindUniversitiesByTypeAndEnabled() {
 		logger.info("----> BEGIN access to findUniversitiesByType test");
 
@@ -723,10 +716,10 @@
 		University university2 = testUtility.createUniqueUniversityInDB();
 		
 		// Create Periods
-		testUtility.createUniquePeriodInDB(university1);
+		testUtility.createUniqueActivePeriodInDB(university1);
 		assertEquals(2, university1.getPeriods().size());
 		
-		testUtility.createUniquePeriodInDB(university2);
+		testUtility.createUniqueActivePeriodInDB(university2);
 		assertEquals(2, university2.getPeriods().size());
 		
 		// Create Departments
@@ -781,14 +774,14 @@
 		testUtility.createUniqueUniversityInDB();
 		
 		// Create Periods
-		testUtility.createUniquePeriodInDB(university1);
+		testUtility.createUniqueActivePeriodInDB(university1);
 		assertEquals(2, university1.getPeriods().size());
 		
 		Period period2 = testUtility.createUniqueInactivePeriodInDB();
 		university1.add(period2);
 		assertEquals(3, university1.getPeriods().size());
 		
-		testUtility.createUniquePeriodInDB(university1);
+		testUtility.createUniqueActivePeriodInDB(university1);
 		assertEquals(4, university1.getPeriods().size());
 		
 		// Create Departments

Modified: branches/openuss-plexus-3.1/plexus/plexus-core/src/test/java/org/openuss/security/acegi/ldap/ConfigurableLdapAuthenticationProviderTest.java
===================================================================
--- branches/openuss-plexus-3.1/plexus/plexus-core/src/test/java/org/openuss/security/acegi/ldap/ConfigurableLdapAuthenticationProviderTest.java	2008-10-05 08:42:59 UTC (rev 4813)
+++ branches/openuss-plexus-3.1/plexus/plexus-core/src/test/java/org/openuss/security/acegi/ldap/ConfigurableLdapAuthenticationProviderTest.java	2008-10-05 12:59:05 UTC (rev 4814)
@@ -8,11 +8,13 @@
 import java.util.List;
 import java.util.Vector;
 
+import javax.naming.CommunicationException;
 import javax.naming.NamingException;
 
 import junit.framework.TestCase;
 
 import org.acegisecurity.Authentication;
+import org.acegisecurity.AuthenticationServiceException;
 import org.acegisecurity.BadCredentialsException;
 import org.acegisecurity.GrantedAuthority;
 import org.acegisecurity.providers.ProviderNotFoundException;
@@ -27,6 +29,7 @@
 import org.openuss.security.ldap.LdapServerType;
 import org.springframework.context.MessageSource;
 import org.springframework.context.support.StaticMessageSource;
+import org.springframework.dao.DataAccessException;
 
 /**
  * Tests <code>ConfigurableLdapAuthenticationProvider</code> class.
@@ -345,6 +348,7 @@
 		ldapAuthenticationProvider.setUserCache(userCache);
 		try {
 			ldapAuthenticationProvider.init();
+			
 		} catch (Exception e) {
 			fail();
 		}
@@ -506,6 +510,9 @@
 		ldapAuthenticationProvider.setUserCache(userCache);
 		try {
 			ldapAuthenticationProvider.init();
+		} catch (javax.naming.CommunicationException e) {
+			// no ldap server available
+			return;
 		} catch (Exception e) {			
 			fail();
 		}
@@ -516,6 +523,12 @@
 		try {
 			ldapAuthenticationProvider.authenticate(authRequest);
 			fail();
+		} catch (AuthenticationServiceException e) {
+			if (!(e.getCause().getCause() instanceof CommunicationException)) {
+				fail(e.getCause().getCause().getMessage());
+			} else {
+				return; // Ldap not available!
+			}
 		} catch (BadCredentialsException be) {
 			// Success
 		}		


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