Menu
▾
▴
[Cse-ip-svn-commits] SF.net SVN: cse-ip:[114] trunk/sandbox/cse-ip
|
From: <id...@us...> - 2009-03-25 19:18:45
|
Revision: 114
http://cse-ip.svn.sourceforge.net/cse-ip/?rev=114&view=rev
Author: idueppe
Date: 2009-03-25 19:17:46 +0000 (Wed, 25 Mar 2009)
Log Message:
-----------
renamed persistence unit for testing to cseip-test
Modified Paths:
--------------
trunk/sandbox/cse-ip/framework/test-utilities/src/main/java/de/campussource/cse/common/test/AbstractPersistentUnitTest.java
trunk/sandbox/cse-ip/sc-cdmm/src/test/resources/META-INF/persistence.xml
trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/IdentityMapperTest.java
trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/PersistentUnitConfigurationTest.java
trunk/sandbox/cse-ip/sc-idmapper/src/test/resources/META-INF/persistence.xml
Added Paths:
-----------
trunk/sandbox/cse-ip/sc-idmapper/src/main/resources/META-INF/persistence.xml
Removed Paths:
-------------
trunk/sandbox/cse-ip/sc-idmapper/src/main/resources/META-INF/persistence.xml
Modified: trunk/sandbox/cse-ip/framework/test-utilities/src/main/java/de/campussource/cse/common/test/AbstractPersistentUnitTest.java
===================================================================
--- trunk/sandbox/cse-ip/framework/test-utilities/src/main/java/de/campussource/cse/common/test/AbstractPersistentUnitTest.java 2009-03-25 19:16:38 UTC (rev 113)
+++ trunk/sandbox/cse-ip/framework/test-utilities/src/main/java/de/campussource/cse/common/test/AbstractPersistentUnitTest.java 2009-03-25 19:17:46 UTC (rev 114)
@@ -20,7 +20,7 @@
@BeforeClass
public static void retrieveEntityManagerFactory() {
- entityManagerFactory = Persistence.createEntityManagerFactory("cseip");
+ entityManagerFactory = Persistence.createEntityManagerFactory("cseip-test");
}
@Before
Modified: trunk/sandbox/cse-ip/sc-cdmm/src/test/resources/META-INF/persistence.xml
===================================================================
--- trunk/sandbox/cse-ip/sc-cdmm/src/test/resources/META-INF/persistence.xml 2009-03-25 19:16:38 UTC (rev 113)
+++ trunk/sandbox/cse-ip/sc-cdmm/src/test/resources/META-INF/persistence.xml 2009-03-25 19:17:46 UTC (rev 114)
@@ -2,7 +2,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
version="1.0">
- <persistence-unit name="cseip" transaction-type="RESOURCE_LOCAL">
+ <persistence-unit name="cseip-test" transaction-type="RESOURCE_LOCAL">
<provider>oracle.toplink.essentials.PersistenceProvider</provider>
<class>de.campussource.cse.cdmm.domain.Account</class>
<class>de.campussource.cse.cdmm.domain.Category</class>
Deleted: trunk/sandbox/cse-ip/sc-idmapper/src/main/resources/META-INF/persistence.xml
===================================================================
--- trunk/sandbox/cse-ip/sc-idmapper/src/main/resources/META-INF/persistence.xml 2009-03-25 19:16:38 UTC (rev 113)
+++ trunk/sandbox/cse-ip/sc-idmapper/src/main/resources/META-INF/persistence.xml 2009-03-25 19:17:46 UTC (rev 114)
@@ -1,21 +0,0 @@
-<persistence xmlns="http://java.sun.com/xml/ns/persistence"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
- version="1.0">
- <persistence-unit name="cs-idmapper" transaction-type="RESOURCE_LOCAL">
- <provider>oracle.toplink.essentials.PersistenceProvider</provider>
- <class>de.campussource.cse.mapper.MappedClientObject</class>
- <properties>
- <property name="toplink.ddl-generation" value="drop-and-create-tables" />
- <property name="toplink.jdbc.driver" value="com.mysql.jdbc.Driver" />
- <property name="toplink.jdbc.url" value="jdbc:mysql://localhost:3306/cseip?createDatabaseIfNotExist=true" />
- <property name="toplink.jdbc.user" value="root" />
- <property name="toplink.jdbc.password" value="masterkey" />
- </properties>
- </persistence-unit>
-</persistence>
-
-
-
-
-
\ No newline at end of file
Added: trunk/sandbox/cse-ip/sc-idmapper/src/main/resources/META-INF/persistence.xml
===================================================================
--- trunk/sandbox/cse-ip/sc-idmapper/src/main/resources/META-INF/persistence.xml (rev 0)
+++ trunk/sandbox/cse-ip/sc-idmapper/src/main/resources/META-INF/persistence.xml 2009-03-25 19:17:46 UTC (rev 114)
@@ -0,0 +1,15 @@
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
+ version="1.0">
+ <persistence-unit name="cs-idmapper">
+ <provider>oracle.toplink.essentials.PersistenceProvider</provider>
+ <jta-data-source>jdbc/cseip</jta-data-source>
+ <class>de.campussource.cse.mapper.MappedClientObject</class>
+ </persistence-unit>
+</persistence>
+
+
+
+
+
\ No newline at end of file
Modified: trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/IdentityMapperTest.java
===================================================================
--- trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/IdentityMapperTest.java 2009-03-25 19:16:38 UTC (rev 113)
+++ trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/IdentityMapperTest.java 2009-03-25 19:17:46 UTC (rev 114)
@@ -3,6 +3,8 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
+import javax.persistence.RollbackException;
+
import org.junit.Before;
import org.junit.Test;
@@ -23,6 +25,9 @@
@Before
public void setUp() {
txBegin();
+ // CleanUp Database
+ entityManager.createNativeQuery("DELETE FROM MAPPED_CLIENT_OBJECT").executeUpdate();
+ commitAndBeginTx();
mapper = new IdentityMapperBean();
autowireByType(mapper);
}
@@ -34,6 +39,16 @@
assertEquals(CLIENT_OBJECT_ID, clientId);
}
+ @Test
+ public void testMultiBusToMapping() throws MapperException {
+ for (int i = 0; i < 10; i++) {
+ Long busId = mapper.toBusId(CLIENT_INSTANCE_ID, CLIENT_OBJECT_ID);
+ String clientId = mapper.toClientObjectId(busId, CLIENT_INSTANCE_ID);
+ assertEquals(CLIENT_OBJECT_ID, clientId);
+ commitAndBeginTx();
+ }
+ }
+
@Test(expected = IdNotFoundException.class)
public void testBusIdNotFound() throws IdNotFoundException {
mapper.toClientObjectId(CLIENT_INSTANCE_ID, UNKNOWN_BUS_ID);
@@ -48,16 +63,25 @@
@Test
public void testPersistClientObjectId() throws MapperException {
- // Persist a new mapping of client object id to a given bus id and verify the results
+ // Persist a new mapping of client object id to a given bus id and
+ // verify the results
mapper.persistClientObjectId(BUS_ID, CLIENT_INSTANCE_ID, CLIENT_OBJECT_ID);
commitAndBeginTx();
assertEquals(BUS_ID, mapper.toBusId(CLIENT_INSTANCE_ID, CLIENT_OBJECT_ID));
assertEquals(CLIENT_OBJECT_ID, mapper.toClientObjectId(BUS_ID, CLIENT_INSTANCE_ID));
- // Override the existing mapping to a new client object id and verify the results
+ // Override the existing mapping to a new client object id and verify
+ // the results
mapper.persistClientObjectId(BUS_ID, CLIENT_INSTANCE_ID, "NEW:CLIENT:OBJECT:ID");
assertEquals(BUS_ID, mapper.toBusId(CLIENT_INSTANCE_ID, "NEW:CLIENT:OBJECT:ID"));
assertEquals("NEW:CLIENT:OBJECT:ID", mapper.toClientObjectId(BUS_ID, CLIENT_INSTANCE_ID));
}
+
+ @Test(expected=RollbackException.class)
+ public void testErrorPersistClientObjectId() throws MapperException {
+ mapper.persistClientObjectId(1L, CLIENT_INSTANCE_ID, CLIENT_OBJECT_ID);
+ mapper.persistClientObjectId(2L, CLIENT_INSTANCE_ID, CLIENT_OBJECT_ID);
+ commitAndBeginTx();
+ }
@Test(expected = IllegalArgumentException.class)
public void testToBusNoClientInstanceParameter() throws IdNotFoundException {
@@ -80,17 +104,17 @@
}
@Test(expected = IllegalArgumentException.class)
- public void testPersistNoBusIdParameter() throws IdNotFoundException {
+ public void testPersistNoBusIdParameter() throws MapperException {
mapper.persistClientObjectId(null, CLIENT_INSTANCE_ID, CLIENT_OBJECT_ID);
}
@Test(expected = IllegalArgumentException.class)
- public void testPersistNoInstanceIdParameter() throws IdNotFoundException {
+ public void testPersistNoInstanceIdParameter() throws MapperException {
mapper.persistClientObjectId(BUS_ID, null, CLIENT_OBJECT_ID);
}
@Test(expected = IllegalArgumentException.class)
- public void testPersistNoObjectIdParameter() throws IdNotFoundException {
+ public void testPersistNoObjectIdParameter() throws MapperException {
mapper.persistClientObjectId(BUS_ID, CLIENT_INSTANCE_ID, "");
}
}
Modified: trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/PersistentUnitConfigurationTest.java
===================================================================
--- trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/PersistentUnitConfigurationTest.java 2009-03-25 19:16:38 UTC (rev 113)
+++ trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/PersistentUnitConfigurationTest.java 2009-03-25 19:17:46 UTC (rev 114)
@@ -18,7 +18,7 @@
@Test
public void testConfiguration() {
try {
- EntityManagerFactory entityManagerFactory = Persistence.createEntityManagerFactory("cseip");
+ EntityManagerFactory entityManagerFactory = Persistence.createEntityManagerFactory("cseip-test");
EntityManager entityManager = entityManagerFactory.createEntityManager();
List<MappedClientObject> mappings = entityManager.createQuery("SELECT m FROM MappedClientObject m").getResultList();
Modified: trunk/sandbox/cse-ip/sc-idmapper/src/test/resources/META-INF/persistence.xml
===================================================================
--- trunk/sandbox/cse-ip/sc-idmapper/src/test/resources/META-INF/persistence.xml 2009-03-25 19:16:38 UTC (rev 113)
+++ trunk/sandbox/cse-ip/sc-idmapper/src/test/resources/META-INF/persistence.xml 2009-03-25 19:17:46 UTC (rev 114)
@@ -2,7 +2,7 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
version="1.0">
- <persistence-unit name="cseip" transaction-type="RESOURCE_LOCAL">
+ <persistence-unit name="cseip-test" transaction-type="RESOURCE_LOCAL">
<provider>oracle.toplink.essentials.PersistenceProvider</provider>
<class>de.campussource.cse.mapper.MappedClientObject</class>
<properties>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
