svn commit: r1300683 - in /incubator/openmeetings/trunk/singlewebapp: ./ src/META-INF/ src/app/org/openmeetings/app/persistence/beans/domain/ src/test/org/openmeetings/test/domain/

[so...@apache.org]

Author: solomax
Date: Wed Mar 14 18:41:37 2012
New Revision: 1300683

URL: http://svn.apache.org/viewvc?rev=1300683&view=rev
Log:
TestUserGroupAggregation is fixed

Added:
    incubator/openmeetings/trunk/singlewebapp/src/META-INF/persistence.xml
      - copied unchanged from r1300512, incubator/openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml
Removed:
    incubator/openmeetings/trunk/singlewebapp/src/META-INF/derby_persistence.xml
Modified:
    incubator/openmeetings/trunk/singlewebapp/build.xml
    incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/domain/Organisation.java
    incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/domain/TestUserGroupAggregation.java

Modified: incubator/openmeetings/trunk/singlewebapp/build.xml
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/build.xml?rev=1300683&r1=1300682&r2=1300683&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/build.xml (original)
+++ incubator/openmeetings/trunk/singlewebapp/build.xml Wed Mar 14 18:41:37 2012
@@ -203,6 +203,7 @@
 				<exclude name="services.xml" />
 			</fileset>
 		</copy>
+		<copy file="src/META-INF/persistence.xml" tofile="${dist.webapps.dir}/WEB-INF/classes/META-INF/derby_persistence.xml" />
 		<copy file="src/META-INF/${db.provider}_persistence.xml" tofile="${dist.webapps.dir}/WEB-INF/classes/META-INF/persistence.xml" />
 
 		<!-- add language files from .war version -->

Modified: incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/domain/Organisation.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/domain/Organisation.java?rev=1300683&r1=1300682&r2=1300683&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/domain/Organisation.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/app/org/openmeetings/app/persistence/beans/domain/Organisation.java Wed Mar 14 18:41:37 2012
@@ -38,7 +38,7 @@ import javax.persistence.Table;
 	, @NamedQuery(name="getAnyOrganisationById",
 		query="SELECT c FROM Organisation AS c WHERE c.organisation_id = :organisation_id")
 	, @NamedQuery(name="getOrganisationsByUserId",
-		query="SELECT u.organisation_users.organisation FROM Users u WHERE u.deleted = 'false' AND u.user_id = :user_id")
+		query="SELECT ou.organisation FROM Users u, IN(u.organisation_users) ou WHERE u.deleted = 'false' AND u.user_id = :user_id")
 })
 @Table(name = "organisation")
 public class Organisation implements Serializable {

Modified: incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/domain/TestUserGroupAggregation.java
URL: http://svn.apache.org/viewvc/incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/domain/TestUserGroupAggregation.java?rev=1300683&r1=1300682&r2=1300683&view=diff
==============================================================================
--- incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/domain/TestUserGroupAggregation.java (original)
+++ incubator/openmeetings/trunk/singlewebapp/src/test/org/openmeetings/test/domain/TestUserGroupAggregation.java Wed Mar 14 18:41:37 2012
@@ -18,8 +18,8 @@
  */
 package org.openmeetings.test.domain;
 
-import java.util.Iterator;
 import java.util.List;
+import static org.junit.Assert.assertTrue;
 
 import org.apache.log4j.Logger;
 import org.junit.Test;
@@ -42,24 +42,20 @@ public class TestUserGroupAggregation ex
 		List<Organisation> orgUser = organisationmanagement.getOrganisationsByUserId(3, 1, 0,
 				100, "organisation_id", true);
 
-		log.error("testitNow" + orgUser.size());
+		assertTrue("Default user must belong to at least one organisation", orgUser.size() > 0);
 
-		for (Iterator<Organisation> it2 = orgUser.iterator(); it2.hasNext();) {
-			Organisation orgUserObj = it2.next();
-			log.error("testitNow" + orgUserObj.getOrganisation_id());
-			log.error(orgUserObj.getName());
+		for (Organisation orgUserObj : orgUser) {
+			log.error("testitNow: organisation Id: '" + orgUserObj.getOrganisation_id() + "'; name: '" + orgUserObj.getName() + "'");
 		}
 
 		List<Organisation> orgUser2 = organisationmanagement.getRestOrganisationsByUserId(3,
 				1, 0, 100, "organisation_id", true);
 
-		log.error("testitNow" + orgUser2.size());
+		log.error("testitNow: rest organisations count: " + orgUser2.size());
 
-		for (Iterator<Organisation> it2 = orgUser2.iterator(); it2.hasNext();) {
-			Organisation orgUserObj = it2.next();
-			log.error("testitNow" + orgUserObj.getOrganisation_id());
-			log.error(orgUserObj.getName());
+		for (Organisation orgUserObj : orgUser2) {
+			log.error("testitNow: organisation Id: '" + orgUserObj.getOrganisation_id() + "'; name: '" + orgUserObj.getName() + "'");
 		}
-
+		
 	}
 }