Menu
▾
▴
[Cse-ip-svn-commits] SF.net SVN: cse-ip:[72] cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/ de/campussource/cse/cdmm
|
From: <ro...@us...> - 2009-03-10 11:24:44
|
Revision: 72
http://cse-ip.svn.sourceforge.net/cse-ip/?rev=72&view=rev
Author: roekens
Date: 2009-03-10 11:24:27 +0000 (Tue, 10 Mar 2009)
Log Message:
-----------
- refactoring, creating of unique id is pulled up to abstract class
- working on course tests
Modified Paths:
--------------
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/AbstractPersistentUnitTest.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/AccountDaoTest.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/CategoryDaoTest.java
cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/CourseDaoTest.java
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/TestXmlConversion.java
Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/AbstractPersistentUnitTest.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/AbstractPersistentUnitTest.java 2009-03-10 11:06:21 UTC (rev 71)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/AbstractPersistentUnitTest.java 2009-03-10 11:24:27 UTC (rev 72)
@@ -21,6 +21,7 @@
public abstract class AbstractPersistentUnitTest {
protected static EntityManagerFactory entityManagerFactory;
+ static Long currentTimeMillis = System.currentTimeMillis();
protected EntityManager entityManager;
@BeforeClass
@@ -111,4 +112,12 @@
txBegin();
}
+ /**
+ * Convenience method for creating a unique id
+ * @return unique id
+ */
+ protected Long createUniqueId() {
+ return currentTimeMillis++;
+ }
+
}
Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/AccountDaoTest.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/AccountDaoTest.java 2009-03-10 11:06:21 UTC (rev 71)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/AccountDaoTest.java 2009-03-10 11:24:27 UTC (rev 72)
@@ -11,8 +11,6 @@
import de.campussource.cse.cdmm.domain.Account;
public class AccountDaoTest extends AbstractPersistentUnitTest {
- private static Long currentTimeMillis = System.currentTimeMillis();
-
private AccountDao dao;
private Account account;
@@ -60,8 +58,4 @@
private Account newAccount() {
return new Account(createUniqueId());
}
-
- private Long createUniqueId(){
- return currentTimeMillis++;
- }
}
Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/CategoryDaoTest.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/CategoryDaoTest.java 2009-03-10 11:06:21 UTC (rev 71)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/CategoryDaoTest.java 2009-03-10 11:24:27 UTC (rev 72)
@@ -15,8 +15,6 @@
public class CategoryDaoTest extends AbstractPersistentUnitTest{
- private static Long currentTimeMillis = System.currentTimeMillis();
-
private CategoryDao dao;
private Category category;
private Category parentCategory;
@@ -109,9 +107,5 @@
private Category newCategory() {
return new Category(createUniqueId());
}
-
- private Long createUniqueId(){
- return currentTimeMillis++;
- }
}
Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/CourseDaoTest.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/CourseDaoTest.java 2009-03-10 11:06:21 UTC (rev 71)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/CourseDaoTest.java 2009-03-10 11:24:27 UTC (rev 72)
@@ -12,11 +12,12 @@
public class CourseDaoTest extends AbstractPersistentUnitTest {
- private static Long currentTimeMillis = System.currentTimeMillis();
-
private CourseDao dao;
private Course course;
+ /**
+ * Creates a course object for testing and the course dao
+ */
@Before
public void setUp() {
course = newCourse();
@@ -25,6 +26,9 @@
txBegin();
}
+ /**
+ * Tests creating of a course object
+ */
@Test
public void testPersistCourse() {
dao.persist(course);
@@ -33,6 +37,9 @@
}
+ /**
+ * Tests searching for a course object by id
+ */
@Test
public void testFindCourse() {
dao.persist(course);
@@ -42,8 +49,11 @@
assertEquals(course, coid);
}
+ /**
+ * Tests deleting of course object
+ */
@Test
- public void testRemoveCategory() {
+ public void testRemoveCourse() {
dao.persist(course);
assertNotNull(course.getId());
commitAndBeginTx();
@@ -52,18 +62,21 @@
assertNull(dao.find(course.getId()));
}
+ /**
+ * Tests if searching for not existing id returns null
+ */
@Test
public void testDoNotFindById() {
Course foundCourse = dao.find(0L);
assertNull(foundCourse);
}
+ /**
+ * Convenience method for creating a course object with a unique id
+ * @return course object with unique id
+ */
private Course newCourse() {
return new Course(createUniqueId());
}
-
- private Long createUniqueId(){
- return currentTimeMillis++;
- }
}
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 11:06:21 UTC (rev 71)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/RoleDaoTest.java 2009-03-10 11:24:27 UTC (rev 72)
@@ -16,8 +16,6 @@
import de.campussource.cse.cdmm.domain.RoleType;
public class RoleDaoTest extends AbstractPersistentUnitTest {
- private static Long currentTimeMillis = System.currentTimeMillis();
-
private RoleDao dao;
private Role role;
@@ -85,8 +83,4 @@
role.setType(RoleType.ASSISTANT);
return role;
}
-
- private Long createUniqueId(){
- return currentTimeMillis++;
- }
}
Modified: cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/TestXmlConversion.java
===================================================================
--- cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/TestXmlConversion.java 2009-03-10 11:06:21 UTC (rev 71)
+++ cse-ip/trunk/sandbox/cse-ip/sc-cdmm/src/test/java/de/campussource/cse/cdmm/TestXmlConversion.java 2009-03-10 11:24:27 UTC (rev 72)
@@ -38,7 +38,7 @@
* @author Sebastian Roekens
*
*/
-public class TestXmlConversion extends TestCase {
+public class TestXmlConversion extends TestCase{
private static Long currentTimeMillis = System.currentTimeMillis();
private Long createUniqueId(){
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
