OO-291: cover DAOs with a lot of unit tests

src/main/java/org/olat/group/BusinessGroupService.java

@@ -51,9 +51,7 @@ public interface BusinessGroupService {
 	public void registerDeletableGroupDataListener(DeletableGroupData listener);
 
 	public List<String> getDependingDeletablableListFor(BusinessGroup currentGroup, Locale locale);
-	
-	
-	
+
 	public BusinessGroup createBusinessGroup(Identity creator, String name, String description,
 			int minParticipants, int maxParticipants, boolean waitingListEnabled, boolean autoCloseRanksEnabled,
 			OLATResource resource);

src/main/java/org/olat/group/manager/BusinessGroupRelationDAO.java

@@ -168,14 +168,15 @@ public class BusinessGroupRelationDAO {
 	}
 	
 	public boolean checkIfOneOrMoreNameExistsInContext(Set<String> names, BusinessGroup group) {
+		if(names == null || names.isEmpty()) return false;
+		
 		StringBuilder sb = new StringBuilder();
-		sb.append("select bgs.key from ").append(BGResourceRelation.class.getName()).append(" as rel ")
+		sb.append("select rel.resource.key from ").append(BGResourceRelation.class.getName()).append(" as rel ")
 			.append(" inner join rel.group bgs ")
 		  .append(" where bgs.key=:groupKey");
 		
 		List<Long> resourceKeys = dbInstance.getCurrentEntityManager().createQuery(sb.toString(), Long.class)
 				.setParameter("groupKey", group.getKey())
-				.setParameter("names", names)
 				.getResultList();
 		
 		return checkIfOneOrMoreNameExistsInContext(names, resourceKeys);
@@ -183,6 +184,7 @@ public class BusinessGroupRelationDAO {
 	
 	public boolean checkIfOneOrMoreNameExistsInContext(Set<String> names, List<Long> resourceKeys) {
 		if(resourceKeys == null || resourceKeys.isEmpty()) return false;
+		if(names == null || names.isEmpty()) return false;
 		
 		StringBuilder sb = new StringBuilder();
 		sb.append("select count(bgs) from ").append(BGResourceRelation.class.getName()).append(" as rel ")
@@ -213,7 +215,7 @@ public class BusinessGroupRelationDAO {
 		}
 
 		StringBuilder sb = new StringBuilder();
-		sb.append("select bgcr.resource from ").append(BGResourceRelation.class.getName()).append(" bgcr where bgcr.group.key in (:groupKeys)");
+		sb.append("select distinct bgcr.resource from ").append(BGResourceRelation.class.getName()).append(" bgcr where bgcr.group.key in (:groupKeys)");
 		
 		TypedQuery<OLATResource> query = dbInstance.getCurrentEntityManager().createQuery(sb.toString(), OLATResource.class);
 		query.setFirstResult(firstResult);

src/test/java/org/olat/group/test/BusinessGroupDAOTest.java

+/**
+ * <a href="http://www.openolat.org">
+ * OpenOLAT - Online Learning and Training</a><br>
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); <br>
+ * you may not use this file except in compliance with the License.<br>
+ * You may obtain a copy of the License at the
+ * <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
+ * <p>
+ * Unless required by applicable law or agreed to in writing,<br>
+ * software distributed under the License is distributed on an "AS IS" BASIS, <br>
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
+ * See the License for the specific language governing permissions and <br>
+ * limitations under the License.
+ * <p>
+ * Initial code contributed and copyrighted by<br>
+ * frentix GmbH, http://www.frentix.com
+ * <p>
+ */
 package org.olat.group.test;
 
 import java.util.ArrayList;

src/test/java/org/olat/group/test/BusinessGroupServiceImplTest.java

@@ -39,6 +39,7 @@ import java.util.UUID;
 
 import org.apache.log4j.Logger;
 import org.junit.After;
+import org.junit.Assert;
 import org.junit.Before;
 import org.junit.Test;
 import org.olat.basesecurity.BaseSecurityManager;
@@ -125,10 +126,10 @@ public class BusinessGroupServiceImplTest extends OlatTestCase {
 		if(initialize) return;
 		
 			// Identities
-			id1 = JunitTestHelper.createAndPersistIdentityAsUser("id1");
-			id2 = JunitTestHelper.createAndPersistIdentityAsUser("id2");
-			id3 = JunitTestHelper.createAndPersistIdentityAsUser("id3");
-			id4 = JunitTestHelper.createAndPersistIdentityAsUser("id4");
+			id1 = JunitTestHelper.createAndPersistIdentityAsUser("id1-bgs-" + UUID.randomUUID().toString());
+			id2 = JunitTestHelper.createAndPersistIdentityAsUser("id2-bgs-" + UUID.randomUUID().toString());
+			id3 = JunitTestHelper.createAndPersistIdentityAsUser("id3-bgs-" + UUID.randomUUID().toString());
+			id4 = JunitTestHelper.createAndPersistIdentityAsUser("id4-bgs-" + UUID.randomUUID().toString());
 			// buddyGroups without waiting-list: groupcontext is null
 			List<BusinessGroup> l = businessGroupService.findBusinessGroupsOwnedBy(id1, null);
 			if (l.size() == 0) {
@@ -205,6 +206,8 @@ public class BusinessGroupServiceImplTest extends OlatTestCase {
 	@Test
 	public void testCheckIfNamesExistsInContext() throws Exception {
 		suiteIsAborted = true;
+		
+		Identity id = JunitTestHelper.createAndPersistIdentityAsUser("id5-check-" + UUID.randomUUID().toString());
 
 		OLATResource ctxA = JunitTestHelper.createRandomResource();
 		OLATResource ctxB = JunitTestHelper.createRandomResource();
@@ -215,11 +218,11 @@ public class BusinessGroupServiceImplTest extends OlatTestCase {
 		BusinessGroup[] ctxBgroups = new BusinessGroup[namesInCtxB.length];
 
 		for (int i = 0; i < namesInCtxA.length; i++) {
-			ctxAgroups[i] = businessGroupService.createBusinessGroup(id1, namesInCtxA[i], null, 0, 0, false,
+			ctxAgroups[i] = businessGroupService.createBusinessGroup(id, namesInCtxA[i], null, 0, 0, false,
 					false, ctxA);
 		}
 		for (int i = 0; i < namesInCtxB.length; i++) {
-			ctxBgroups[i] = businessGroupService.createBusinessGroup(id1, namesInCtxB[i], null, 0, 0, false,
+			ctxBgroups[i] = businessGroupService.createBusinessGroup(id, namesInCtxB[i], null, 0, 0, false,
 					false, ctxB);
 		}
 		// first click created two context and each of them containg groups
@@ -299,71 +302,43 @@ public class BusinessGroupServiceImplTest extends OlatTestCase {
 	@Test
 	public void testCreateAndPersistBuddyGroup() throws Exception {
 		suiteIsAborted = true;
-		/*
-		 * 
-		 */
-		List<BusinessGroup> sqlRes;
-		BusinessGroup found;
-		/*
-		 * id1
-		 */
-		sqlRes = businessGroupService.findBusinessGroupsOwnedBy(id1, null);
-		assertTrue("2 BuddyGroups owned by id1", sqlRes.size() == 2);
-		for (int i = 0; i < sqlRes.size(); i++) {
-			assertTrue("It's a BuddyGroup Object", sqlRes.get(i) instanceof BusinessGroup);
-			found = (BusinessGroup) sqlRes.get(i);
-			// equality by comparing PersistenObject.getKey()!!!
-			boolean ok = one.getKey().longValue() == found.getKey().longValue() || three.getKey().longValue() == found.getKey().longValue();
-			assertTrue("It's the correct BuddyGroup", ok);
 
-		}
-		sqlRes = businessGroupService.findBusinessGroupsAttendedBy(id1, null);
-		assertTrue("0 BuddyGroup where id1 is partipicating", sqlRes.size() == 0);
+		// id1
+		List<BusinessGroup> groupOwnedId1 = businessGroupService.findBusinessGroupsOwnedBy(id1, null);
+		Assert.assertEquals("2 BuddyGroups owned by id1", 3, groupOwnedId1.size());
+		Assert.assertTrue(groupOwnedId1.contains(one));
+		Assert.assertTrue(groupOwnedId1.contains(three));
+		Assert.assertTrue(groupOwnedId1.contains(bgWithWaitingList));
 
-		/*
-		 * id2
-		 */
-		sqlRes = businessGroupService.findBusinessGroupsOwnedBy(id2, null);
-		assertTrue("1 BuddyGroup owned by id2", sqlRes.size() == 1);
-		assertTrue("It's a BuddyGroup Object", sqlRes.get(0) instanceof BusinessGroup);
-		found = (BusinessGroup) sqlRes.get(0);
-		// equality by comparing PersistenObject.getKey()!!!
-		assertTrue("It's the correct BuddyGroup", two.getKey().longValue() == found.getKey().longValue());
-		sqlRes = businessGroupService.findBusinessGroupsAttendedBy(id2, null);
-		assertTrue("1 BuddyGroup where id2 is partipicating", sqlRes.size() == 1);
-		assertTrue("It's a BuddyGroup Object", sqlRes.get(0) instanceof BusinessGroup);
-		found = (BusinessGroup) sqlRes.get(0);
-		assertTrue("It's the correct BuddyGroup", three.getKey().longValue() == found.getKey().longValue());
+		List<BusinessGroup> groupAttendeeId1 = businessGroupService.findBusinessGroupsAttendedBy(id1, null);
+		Assert.assertEquals("0 BuddyGroup where id1 is partipicating", 0, groupAttendeeId1.size());
 
-		/*
-		 * id3
-		 */
-		sqlRes = businessGroupService.findBusinessGroupsOwnedBy(id3, null);
-		assertTrue("1 BuddyGroup owned by id3", sqlRes.size() == 1);
-		assertTrue("It's a BuddyGroup Object", sqlRes.get(0) instanceof BusinessGroup);
-		found = (BusinessGroup) sqlRes.get(0);
-		// equality by comparing PersistenObject.getKey()!!!
-		assertTrue("It's the correct BuddyGroup", three.getKey().longValue() == found.getKey().longValue());
-		sqlRes = businessGroupService.findBusinessGroupsAttendedBy(id3, null);
-		assertTrue("1 BuddyGroup where id3 is partipicating", sqlRes.size() == 1);
-		assertTrue("It's a BuddyGroup Object", sqlRes.get(0) instanceof BusinessGroup);
-		found = (BusinessGroup) sqlRes.get(0);
-		assertTrue("It's the correct BuddyGroup", two.getKey().longValue() == found.getKey().longValue());
+		// id2
+		List<BusinessGroup> groupOwnedId2 = businessGroupService.findBusinessGroupsOwnedBy(id2, null);
+		Assert.assertEquals("1 BuddyGroup owned by id2", 1, groupOwnedId2.size());
+		Assert.assertTrue(groupOwnedId2.contains(two));
+		
+		List<BusinessGroup> groupAttendeeId2 = businessGroupService.findBusinessGroupsAttendedBy(id2, null);
+		Assert.assertEquals("1 BuddyGroup where id2 is partipicating", 1, groupAttendeeId2.size());
+		assertTrue("It's the correct BuddyGroup", groupAttendeeId2.contains(three));
+
+		// id3
+		List<BusinessGroup> groupOwnedId3 = businessGroupService.findBusinessGroupsOwnedBy(id3, null);
+		Assert.assertEquals("1 BuddyGroup owned by id3", 1, groupOwnedId3.size());
+		assertTrue("It's the correct BuddyGroup", groupOwnedId3.contains(three));
+		
+		List<BusinessGroup> groupAttendeeId3 = businessGroupService.findBusinessGroupsAttendedBy(id3, null);
+		Assert.assertEquals("1 BuddyGroup where id3 is partipicating", 1, groupAttendeeId3.size());
+		assertTrue("It's the correct BuddyGroup", groupAttendeeId3.contains(two));
+
+		// id4
+		List<BusinessGroup> groupOwnedId4 = businessGroupService.findBusinessGroupsOwnedBy(id4, null);
+		Assert.assertEquals("0 BuddyGroup owned by id4", 0, groupOwnedId4.size());
+
+		List<BusinessGroup> groupAttendeeId4 = businessGroupService.findBusinessGroupsAttendedBy(id4, null);
+		Assert.assertEquals("1 BuddyGroup where id4 is partipicating", 1, groupAttendeeId4.size());
+		assertTrue("It's the correct BuddyGroup", groupAttendeeId4.contains(two));
 
-		/*
-		 * id4
-		 */
-		sqlRes = businessGroupService.findBusinessGroupsOwnedBy(id4, null);
-		assertTrue("0 BuddyGroup owned by id4", sqlRes.size() == 0);
-		//
-		sqlRes = businessGroupService.findBusinessGroupsAttendedBy(id4, null);
-		assertTrue("1 BuddyGroup where id4 is partipicating", sqlRes.size() == 1);
-		assertTrue("It's a BuddyGroup Object", sqlRes.get(0) instanceof BusinessGroup);
-		found = (BusinessGroup) sqlRes.get(0);
-		assertTrue("It's the correct BuddyGroup", two.getKey().longValue() == found.getKey().longValue());
-		/*
-		 * 
-		 */
 		suiteIsAborted = false;
 		nrOfTestCasesAlreadyRun++;
 	}

src/test/java/org/olat/group/test/BusinessGroupServiceTest.java

+/**
+ * <a href="http://www.openolat.org">
+ * OpenOLAT - Online Learning and Training</a><br>
+ * <p>
+ * Licensed under the Apache License, Version 2.0 (the "License"); <br>
+ * you may not use this file except in compliance with the License.<br>
+ * You may obtain a copy of the License at the
+ * <a href="http://www.apache.org/licenses/LICENSE-2.0">Apache homepage</a>
+ * <p>
+ * Unless required by applicable law or agreed to in writing,<br>
+ * software distributed under the License is distributed on an "AS IS" BASIS, <br>
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. <br>
+ * See the License for the specific language governing permissions and <br>
+ * limitations under the License.
+ * <p>
+ * Initial code contributed and copyrighted by<br>
+ * frentix GmbH, http://www.frentix.com
+ * <p>
+ */
 package org.olat.group.test;
 
 import static org.junit.Assert.assertNotNull;

src/test/java/org/olat/restapi/ContactsTest.java

@@ -113,45 +113,47 @@ public class ContactsTest extends OlatJerseyTestCase {
 		DBFactory.getInstance().intermediateCommit();
 			
 		//create learn group
-	    BaseSecurity secm = BaseSecurityManager.getInstance();
-			
-	    // 1) context one: learning groups
-	    OLATResource c1 = JunitTestHelper.createRandomResource();
-	    // create groups without waiting list
-	    g1 = businessGroupService.createBusinessGroup(null, "rest-g1", null, new Integer(0), new Integer(10), false, false, c1);
-	    g2 = businessGroupService.createBusinessGroup(null, "rest-g2", null, new Integer(0), new Integer(10), false, false, c1);
-	    
-	    //permission to see owners and participants
-	    BusinessGroupPropertyManager bgpm1 = new BusinessGroupPropertyManager(g1);
-	    bgpm1.updateDisplayMembers(false, false, false);
-	    BusinessGroupPropertyManager bgpm2 = new BusinessGroupPropertyManager(g2);
-	    bgpm2.updateDisplayMembers(true, true, false);
-	    
-	    // members g1
-	    secm.addIdentityToSecurityGroup(owner1, g1.getOwnerGroup());
-	    secm.addIdentityToSecurityGroup(owner2, g1.getOwnerGroup());
-	    secm.addIdentityToSecurityGroup(part1, g1.getPartipiciantGroup());
-	    secm.addIdentityToSecurityGroup(part2, g1.getPartipiciantGroup());
-	    
-	    // members g2
-	    secm.addIdentityToSecurityGroup(owner1, g2.getOwnerGroup());
-	    secm.addIdentityToSecurityGroup(part1, g2.getPartipiciantGroup());
-	    
-	    
-	    // 2) context two: right groups
-	    OLATResource c2 = JunitTestHelper.createRandomResource();
-	    // groups
-	    g3 = businessGroupService.createBusinessGroup(null, "rest-g3", null, -1, -1, false, false, c2);
-	    g4 = businessGroupService.createBusinessGroup(null, "rest-g4", null, -1, -1, false, false, c2);
-	    // members -> default participants are visible
-	    secm.addIdentityToSecurityGroup(owner1, g3.getPartipiciantGroup());
-	    secm.addIdentityToSecurityGroup(part3, g3.getPartipiciantGroup());
-	    
-	    secm.addIdentityToSecurityGroup(owner2, g4.getPartipiciantGroup());
-	    secm.addIdentityToSecurityGroup(part3, g4.getPartipiciantGroup());
-	    
-	    DBFactory.getInstance().commitAndCloseSession(); // simulate user clicks
-	    initialized = true;
+    BaseSecurity secm = BaseSecurityManager.getInstance();
+		
+    // 1) context one: learning groups
+    OLATResource c1 = JunitTestHelper.createRandomResource();
+    // create groups without waiting list
+    g1 = businessGroupService.createBusinessGroup(null, "rest-g1", null, 0, 10, false, false, c1);
+    g2 = businessGroupService.createBusinessGroup(null, "rest-g2", null, 0, 10, false, false, c1);
+    
+    //permission to see owners and participants
+    BusinessGroupPropertyManager bgpm1 = new BusinessGroupPropertyManager(g1);
+    bgpm1.updateDisplayMembers(false, false, false);
+    BusinessGroupPropertyManager bgpm2 = new BusinessGroupPropertyManager(g2);
+    bgpm2.updateDisplayMembers(true, true, false);
+    
+    // members g1
+    secm.addIdentityToSecurityGroup(owner1, g1.getOwnerGroup());
+    secm.addIdentityToSecurityGroup(owner2, g1.getOwnerGroup());
+    secm.addIdentityToSecurityGroup(part1, g1.getPartipiciantGroup());
+    secm.addIdentityToSecurityGroup(part2, g1.getPartipiciantGroup());
+    
+    // members g2
+    secm.addIdentityToSecurityGroup(owner1, g2.getOwnerGroup());
+    secm.addIdentityToSecurityGroup(part1, g2.getPartipiciantGroup());
+    
+    
+    // 2) context two: right groups
+    OLATResource c2 = JunitTestHelper.createRandomResource();
+    // groups
+    g3 = businessGroupService.createBusinessGroup(null, "rest-g3", null, -1, -1, false, false, c2);
+    new BusinessGroupPropertyManager(g3).updateDisplayMembers(false, true, false);
+    g4 = businessGroupService.createBusinessGroup(null, "rest-g4", null, -1, -1, false, false, c2);
+    new BusinessGroupPropertyManager(g4).updateDisplayMembers(false, true, false);
+    // members -> default participants are visible
+    secm.addIdentityToSecurityGroup(owner1, g3.getPartipiciantGroup());
+    secm.addIdentityToSecurityGroup(part3, g3.getPartipiciantGroup());
+    
+    secm.addIdentityToSecurityGroup(owner2, g4.getPartipiciantGroup());
+    secm.addIdentityToSecurityGroup(part3, g4.getPartipiciantGroup());
+    
+    DBFactory.getInstance().commitAndCloseSession(); // simulate user clicks
+    initialized = true;
 	}
 	
 	@Test

src/test/java/org/olat/restapi/CourseGroupMgmtTest.java

@@ -161,7 +161,7 @@ public class CourseGroupMgmtTest extends OlatJerseyTestCase {
 		
 		List<GroupVO> vos = parseGroupArray(body);
 		assertNotNull(vos);
-		assertEquals(2, vos.size());//g1, g2, g3, g4
+		assertEquals(4, vos.size());//g1, g2, g3, g4
 		
 		List<Long> voKeys = new ArrayList<Long>(4);
 		for(GroupVO vo:vos) {
@@ -169,8 +169,8 @@ public class CourseGroupMgmtTest extends OlatJerseyTestCase {
 		}
 		assertTrue(voKeys.contains(g1.getKey()));
 		assertTrue(voKeys.contains(g2.getKey()));
-		//assertTrue(voKeys.contains(g3.getKey()));
-		//assertTrue(voKeys.contains(g4.getKey()));
+		assertTrue(voKeys.contains(g3.getKey()));
+		assertTrue(voKeys.contains(g4.getKey()));
 	}
 	
 	@Test

src/test/java/org/olat/restapi/UserMgmtTest.java

@@ -774,7 +774,7 @@ public class UserMgmtTest extends OlatJerseyTestCase {
 		InputStream body = response.getEntity().getContent();
 		List<GroupVO> groups = parseGroupArray(body);
 		assertNotNull(groups);
-		assertEquals(2, groups.size());//g1 and g2 as g3 and g4 are right groups which are not returned
+		assertEquals(3, groups.size());//g1, g2 and g3
 	}
 	
 	@Test
@@ -793,7 +793,7 @@ public class UserMgmtTest extends OlatJerseyTestCase {
 		assertNotNull(groups);
 		assertNotNull(groups.getGroups());
 		assertEquals(1, groups.getGroups().length);
-		assertEquals(2, groups.getTotalCount());//g1 and g2 as g3 and g4 are right groups which are not returned
+		assertEquals(3, groups.getTotalCount());//g1, g2 and g3
 	}
 	
 	@Test
@@ -812,7 +812,7 @@ public class UserMgmtTest extends OlatJerseyTestCase {
 		assertNotNull(groups);
 		assertNotNull(groups.getGroups());
 		assertEquals(1, groups.getGroups().length);
-		assertEquals(2, groups.getTotalCount());//g1 and g2 as g3 and g4 are right groups which are not returned
+		assertEquals(3, groups.getTotalCount());//g1, g2 and g3
 	}
 	
 	@Test

src/test/java/org/olat/test/AllTestsJunit4.java

@@ -74,9 +74,12 @@ import org.junit.runners.Suite;
 	org.olat.commons.coordinate.cluster.lock.LockTest.class,//ok
 	org.olat.commons.coordinate.CoordinatorTest.class,//ok
 	org.olat.admin.user.delete.service.UserDeletionManagerTest.class,//ok
-	org.olat.group.test.BGRightManagerTest.class,//fail
+	org.olat.group.test.BGRightManagerTest.class,//ok
 	org.olat.group.test.BGAreaManagerTest.class,//ok
+	org.olat.group.test.BusinessGroupServiceTest.class,//ok
 	org.olat.group.test.BusinessGroupServiceImplTest.class,//ok
+	org.olat.group.test.BusinessGroupDAOTest.class,//ok
+	org.olat.group.test.BusinessGroupRelationDAOTest.class,//ok
 	org.olat.resource.lock.pessimistic.PLockTest.class,//ok
 	org.olat.resource.references.ReferenceManagerTest.class,//ok
 	org.olat.resource.OLATResourceManagerTest.class,//ok