Menu
▾
▴
[Cse-ip-svn-commits] SF.net SVN: cse-ip:[99] trunk/sandbox/cse-ip/sc-cdmm/src
|
From: <ro...@us...> - 2009-03-24 14:09:55
|
Revision: 99
http://cse-ip.svn.sourceforge.net/cse-ip/?rev=99&view=rev
Author: roekens
Date: 2009-03-24 14:09:33 +0000 (Tue, 24 Mar 2009)
Log Message:
-----------
- removed warnings
- completed code coverage to 100%
Modified Paths:
--------------
trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerBean.java
trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/DAOJPA.java
trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Entity.java
trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DaoTest.java
trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DataModelManagerBeanTest.java
Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerBean.java
===================================================================
--- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerBean.java 2009-03-24 13:52:47 UTC (rev 98)
+++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/DataModelManagerBean.java 2009-03-24 14:09:33 UTC (rev 99)
@@ -7,8 +7,6 @@
import javax.ejb.TransactionAttribute;
import javax.ejb.TransactionAttributeType;
-import org.apache.commons.lang.Validate;
-
import de.campussource.cse.cdmm.dao.*;
import de.campussource.cse.cdmm.domain.Account;
import de.campussource.cse.cdmm.domain.Category;
@@ -122,8 +120,6 @@
@Override
@TransactionAttribute(TransactionAttributeType.REQUIRED)
public CSEMessage retrieveRole(long accountId, long courseId) throws DataModelManagerException {
- Validate.notNull(accountId,"DataModelManagerBean.retrieveRole: Parameter accountId is mandatory.");
- Validate.notNull(courseId,"DataModelManagerBean.retrieveRole: Parameter courseId is mandatory.");
Role role = roleDao.retrieveRole(accountId, courseId);
CSEMessage csem = new CSEMessageImpl();
csem.addEntity(role);
Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/DAOJPA.java
===================================================================
--- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/DAOJPA.java 2009-03-24 13:52:47 UTC (rev 98)
+++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/dao/DAOJPA.java 2009-03-24 14:09:33 UTC (rev 99)
@@ -2,7 +2,6 @@
import java.io.Serializable;
import java.lang.reflect.ParameterizedType;
-import java.net.IDN;
import javax.ejb.TransactionAttribute;
import javax.ejb.TransactionAttributeType;
@@ -21,6 +20,7 @@
private Class<E> persistentClass;
+ @SuppressWarnings("unchecked")
public DAOJPA() {
this.persistentClass = (Class<E>) ((ParameterizedType) getClass().getGenericSuperclass()).getActualTypeArguments()[0];
}
Modified: trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Entity.java
===================================================================
--- trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Entity.java 2009-03-24 13:52:47 UTC (rev 98)
+++ trunk/sandbox/cse-ip/sc-cdmm/src/main/java/de/campussource/cse/cdmm/domain/Entity.java 2009-03-24 14:09:33 UTC (rev 99)
@@ -13,7 +13,6 @@
import javax.persistence.Transient;
import javax.xml.bind.annotation.XmlElement;
import javax.xml.bind.annotation.XmlElementWrapper;
-import javax.xml.bind.annotation.XmlElements;
import javax.xml.bind.annotation.XmlID;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlType;
@@ -84,7 +83,6 @@
}
@XmlElementWrapper(name=Constants.ATTRIBUTES)
- //@XmlElements(value={@XmlElement(name=Constants.ATTRIBUTE,type=Attribute.class), @XmlElement(name=Constants.ATTRIBUTE,type=TransientAttribute.class), @XmlElement(name=Constants.ATTRIBUTE, type=PersistentAttribute.class)})
@XmlElement(name=Constants.ATTRIBUTE)
public List<Attribute> getAttributes() {
return attributes;
Modified: trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DaoTest.java
===================================================================
--- trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DaoTest.java 2009-03-24 13:52:47 UTC (rev 98)
+++ trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DaoTest.java 2009-03-24 14:09:33 UTC (rev 99)
@@ -6,7 +6,6 @@
import org.junit.Test;
import de.campussource.cse.cdmm.dao.AccountDao;
-import de.campussource.cse.cdmm.domain.Entity;
import de.campussource.cse.common.test.AbstractPersistentUnitTest;
public class DaoTest extends AbstractPersistentUnitTest {
Modified: trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DataModelManagerBeanTest.java
===================================================================
--- trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DataModelManagerBeanTest.java 2009-03-24 13:52:47 UTC (rev 98)
+++ trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/DataModelManagerBeanTest.java 2009-03-24 14:09:33 UTC (rev 99)
@@ -4,12 +4,6 @@
import java.util.List;
-import javax.ejb.TransactionAttribute;
-import javax.ejb.TransactionAttributeType;
-import javax.persistence.NoResultException;
-import javax.persistence.Query;
-
-import org.apache.commons.lang.Validate;
import org.junit.Before;
import org.junit.Test;
import static org.junit.Assert.*;
@@ -20,6 +14,7 @@
import de.campussource.cse.cdmm.domain.Entity;
import de.campussource.cse.cdmm.domain.Group;
import de.campussource.cse.cdmm.domain.Role;
+import de.campussource.cse.cdmm.domain.RoleType;
import de.campussource.cse.common.test.AbstractPersistentUnitTest;
public class DataModelManagerBeanTest extends AbstractPersistentUnitTest {
@@ -269,6 +264,7 @@
}
assertNull(csem);
Role role = new Role(roleId);
+ role.setType(RoleType.ASSISTANT);
try {
dmm.saveRole(role);
fail("Creating of role without account and course reference should be impossible");
@@ -315,7 +311,86 @@
@Test
public void testRoleQueries(){
+ long roleId = uniqueId();
+ CSEMessage csem = null;
+ try {
+ csem = dmm.retrieveRole(roleId);
+ fail("Exception should occur");
+ } catch (DataModelManagerException e) {
+ // Exception should occur
+ }
+ assertNull(csem);
+ Role role = new Role(roleId);
+ role.setType(RoleType.ASSISTANT);
+ try {
+ dmm.saveRole(role);
+ fail("Creating of role without account and course reference should be impossible");
+ } catch (DataModelManagerException e) {
+ //Exception should occur;
+ }
+ Account account = new Account (uniqueId());
+ Course course = new Course (uniqueId());
+ try{
+ dmm.saveAccount(account);
+ dmm.saveCourse(course);
+ } catch (DataModelManagerException e){
+ fail("Unexpected DataModelManager Exception");
+ }
+ role.addToCourseAndAccount(course, account);
+ try {
+ dmm.saveRole(role);
+ } catch (DataModelManagerException e) {
+ fail("Unexpected DataModelManager Exception");
+ }
+ csem = null;
+ try {
+ csem = dmm.retrieveRole(roleId);
+ } catch (DataModelManagerException e) {
+ fail("Creating or retrieving of role failed");
+ }
+ assertNotNull(csem);
+ assertEquals(1, csem.getEntities().size());
+ assertEquals(role, csem.getEntities().get(0));
+ csem = null;
+ try {
+ csem = dmm.retrieveRole(0, course.getId());
+ fail("DataModelManagerException expected");
+ } catch (DataModelManagerException e) {
+ // Exception expected
+ }
+
+ csem = null;
+ try {
+ csem = dmm.retrieveRole(account.getId(), 0);
+ fail("DataModelManagerException expected");
+ } catch (DataModelManagerException e) {
+ // Exception expected
+ }
+
+ csem = null;
+ try {
+ csem = dmm.retrieveRole(1l, 1l);
+ fail("DataModelManagerException expected");
+ } catch (DataModelManagerException e) {
+ // Exception expected
+ }
+
+ csem = null;
+ try {
+ csem = dmm.retrieveRole(account.getId(), course.getId());
+ } catch (DataModelManagerException e) {
+ fail("role could not be retrieved");
+ }
+ assertNotNull(csem);
+ assertEquals(role, csem.getEntities().get(0));
+
}
+ @Test
+ public void testConstants(){
+ @SuppressWarnings("unused")
+ Constants constants = new Constants();
+ }
+
}
\ No newline at end of file
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
