Menu
▾
▴
[Cse-ip-svn-commits] SF.net SVN: cse-ip:[96] trunk/sandbox/cse-ip/sc-idmapper/src
|
From: <id...@us...> - 2009-03-18 08:55:20
|
Revision: 96
http://cse-ip.svn.sourceforge.net/cse-ip/?rev=96&view=rev
Author: idueppe
Date: 2009-03-18 08:55:19 +0000 (Wed, 18 Mar 2009)
Log Message:
-----------
Add unit test to archive 100 % code coverage and add a persistence.xml for deployment.
Modified Paths:
--------------
trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/MappedClientObject.java
trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/MappedClientObjectPK.java
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/
trunk/sandbox/cse-ip/sc-idmapper/src/main/resources/META-INF/persistence.xml
trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/IdNotFoundExceptionTest.java
trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/MappedClientObjectPKTest.java
trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/MappedClientObjectTest.java
Modified: trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/MappedClientObject.java
===================================================================
--- trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/MappedClientObject.java 2009-03-18 08:54:12 UTC (rev 95)
+++ trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/MappedClientObject.java 2009-03-18 08:55:19 UTC (rev 96)
@@ -16,6 +16,9 @@
import org.apache.commons.lang.builder.ToStringBuilder;
import org.apache.commons.lang.builder.ToStringStyle;
+/**
+ * @author Ingo Dueppe
+ */
@Entity(name="MappedClientObject")
@Table(name = "MAPPED_CLIENT_OBJECT",
uniqueConstraints = @UniqueConstraint(columnNames = { "CLIENT_OBJECT_ID", "CLIENT_INSTANCE_ID" }))
@@ -83,15 +86,13 @@
}
if (!(obj instanceof MappedClientObject)) {
return false;
- } else {
- MappedClientObject other = (MappedClientObject) obj;
- return new EqualsBuilder().append(busId, other.busId).append(clientInstanceId, other.clientInstanceId)
- .append(clientObjectId, other.clientObjectId).isEquals();
- }
+ }
+ MappedClientObject other = (MappedClientObject) obj;
+ return new EqualsBuilder().append(busId, other.busId).append(clientInstanceId, other.clientInstanceId).isEquals();
}
public int hashCode() {
- return new HashCodeBuilder().append(busId).append(clientInstanceId).append(clientObjectId).toHashCode();
+ return new HashCodeBuilder().append(busId).append(clientInstanceId).toHashCode();
}
public String toString() {
Modified: trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/MappedClientObjectPK.java
===================================================================
--- trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/MappedClientObjectPK.java 2009-03-18 08:54:12 UTC (rev 95)
+++ trunk/sandbox/cse-ip/sc-idmapper/src/main/java/de/campussource/cse/mapper/MappedClientObjectPK.java 2009-03-18 08:55:19 UTC (rev 96)
@@ -13,12 +13,18 @@
public class MappedClientObjectPK implements Serializable {
private static final long serialVersionUID = 4835950977456597594L;
-
+
private Long busId;
private Long clientInstanceId;
-
- public MappedClientObjectPK() {}
+ public MappedClientObjectPK() {
+ }
+
+ public MappedClientObjectPK(Long busId, Long clientInstanceId) {
+ this.busId = busId;
+ this.clientInstanceId = clientInstanceId;
+ }
+
public Long getBusId() {
return busId;
}
@@ -41,11 +47,9 @@
}
if (!(obj instanceof MappedClientObjectPK)) {
return false;
- } else {
- MappedClientObjectPK other = (MappedClientObjectPK) obj;
- return new EqualsBuilder().append(busId, other.busId).append(clientInstanceId, other.clientInstanceId)
- .isEquals();
}
+ MappedClientObjectPK other = (MappedClientObjectPK) obj;
+ return new EqualsBuilder().append(busId, other.busId).append(clientInstanceId, other.clientInstanceId).isEquals();
}
public int hashCode() {
@@ -56,5 +60,4 @@
return new ToStringBuilder(this, ToStringStyle.DEFAULT_STYLE).append(busId).append(clientInstanceId).toString();
}
-
}
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-18 08:55:19 UTC (rev 96)
@@ -0,0 +1,21 @@
+<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
Property changes on: trunk/sandbox/cse-ip/sc-idmapper/src/main/resources/META-INF/persistence.xml
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/IdNotFoundExceptionTest.java
===================================================================
--- trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/IdNotFoundExceptionTest.java (rev 0)
+++ trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/IdNotFoundExceptionTest.java 2009-03-18 08:55:19 UTC (rev 96)
@@ -0,0 +1,39 @@
+package de.campussource.cse.mapper;
+
+import static org.junit.Assert.*;
+
+import org.junit.Test;
+
+/**
+ * @author Ingo Dueppe
+ */
+public class IdNotFoundExceptionTest {
+
+ @Test
+ public void testDefaultConstructor() {
+ MapperException me = new IdNotFoundException();
+ assertNotNull(me);
+ }
+
+ @Test
+ public void testMessageConstructor() {
+ MapperException me = new IdNotFoundException("message");
+ assertEquals("message", me.getMessage());
+ }
+
+ @Test
+ public void testCauseConstructor() {
+ MapperException me = new IdNotFoundException("message");
+ MapperException me2 = new IdNotFoundException(me);
+ assertEquals(me,me2.getCause());
+ }
+
+ @Test
+ public void testMessageCauseConstructor() {
+ MapperException me = new IdNotFoundException("message");
+ MapperException me2 = new IdNotFoundException("message", me);
+ assertEquals(me, me2.getCause());
+ assertEquals("message", me2.getMessage());
+ }
+
+}
Property changes on: trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/IdNotFoundExceptionTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
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-18 08:54:12 UTC (rev 95)
+++ trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/IdentityMapperTest.java 2009-03-18 08:55:19 UTC (rev 96)
@@ -8,6 +8,9 @@
import de.campussource.cse.common.test.AbstractPersistentUnitTest;
+/**
+ * @author Ingo Dueppe
+ */
public class IdentityMapperTest extends AbstractPersistentUnitTest {
private static final Long UNKNOWN_BUS_ID = -1000L;
Added: trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/MappedClientObjectPKTest.java
===================================================================
--- trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/MappedClientObjectPKTest.java (rev 0)
+++ trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/MappedClientObjectPKTest.java 2009-03-18 08:55:19 UTC (rev 96)
@@ -0,0 +1,63 @@
+package de.campussource.cse.mapper;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+/**
+ * @author Ingo Dueppe
+ */
+public class MappedClientObjectPKTest {
+
+ @Test
+ public void testEquals() {
+ MappedClientObjectPK pk = new MappedClientObjectPK();
+ assertTrue(pk.equals(pk));
+
+ assertFalse(new MappedClientObjectPK().equals(new Object()));
+ assertFalse(new Object().equals(new MappedClientObjectPK()));
+
+ assertFalse(new MappedClientObjectPK(1L, 1L).equals(new MappedClientObjectPK()));
+ assertFalse(new MappedClientObjectPK().equals(new MappedClientObjectPK(1L, 1L)));
+
+ assertTrue(new MappedClientObjectPK(1L, 1L).equals(new MappedClientObjectPK(1L, 1L)));
+
+ assertFalse(new MappedClientObjectPK(1L, 2L).equals(new MappedClientObjectPK(2L, 1L)));
+ assertFalse(new MappedClientObjectPK(1L, 1L).equals(new MappedClientObjectPK(1L, 2L)));
+
+ assertTrue(new MappedClientObjectPK(1L, null).equals(new MappedClientObjectPK(1L, null)));
+ assertFalse(new MappedClientObjectPK(null, null).equals(new MappedClientObjectPK(1L, null)));
+
+ assertTrue(new MappedClientObjectPK().equals(new MappedClientObjectPK()));
+ }
+
+ @Test
+ public void testSetters() {
+ MappedClientObjectPK pk = new MappedClientObjectPK();
+
+ assertTrue(pk.getBusId() == null);
+ assertTrue(pk.getClientInstanceId() == null);
+
+ pk.setBusId(1L);
+ assertEquals((Long)1L, pk.getBusId());
+
+ pk.setClientInstanceId(1L);
+ assertEquals((Long)1L, pk.getClientInstanceId());
+ }
+
+ @Test
+ public void testToString() {
+ assertFalse(new MappedClientObjectPK().toString().isEmpty());
+ }
+
+ @Test
+ public void testHashCode() {
+ assertEquals(new MappedClientObjectPK(1L,1L).hashCode(), new MappedClientObjectPK(1L,1L).hashCode());
+ assertNotSame(new MappedClientObjectPK(1L,1L).hashCode(), new MappedClientObjectPK(1L,2L).hashCode());
+ assertNotSame(new MappedClientObjectPK(1L,1L).hashCode(), new MappedClientObjectPK(2L,1L).hashCode());
+ }
+
+}
Property changes on: trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/MappedClientObjectPKTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
Added: trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/MappedClientObjectTest.java
===================================================================
--- trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/MappedClientObjectTest.java (rev 0)
+++ trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/MappedClientObjectTest.java 2009-03-18 08:55:19 UTC (rev 96)
@@ -0,0 +1,54 @@
+package de.campussource.cse.mapper;
+
+import static org.junit.Assert.assertEquals;
+import static org.junit.Assert.assertFalse;
+import static org.junit.Assert.assertNotSame;
+import static org.junit.Assert.assertTrue;
+
+import org.junit.Test;
+
+/**
+ * @author Ingo Dueppe
+ */
+public class MappedClientObjectTest {
+
+ @Test
+ public void testEquals() {
+ MappedClientObject mapped = new MappedClientObject();
+ assertTrue(mapped.equals(mapped));
+
+ assertFalse(new MappedClientObject().equals(new Object()));
+ assertFalse(new Object().equals(new MappedClientObject()));
+
+ assertFalse(new MappedClientObject(1L, 1L, "").equals(new MappedClientObject()));
+ assertFalse(new MappedClientObject().equals(new MappedClientObject(1L, 1L, "")));
+
+ assertTrue(new MappedClientObject(1L, 1L, "").equals(new MappedClientObject(1L, 1L, "")));
+ assertTrue(new MappedClientObject(1L, 1L, "").equals(new MappedClientObject(1L, 1L, "XYZ")));
+
+ assertFalse(new MappedClientObject(1L, 2L, "").equals(new MappedClientObject(2L, 1L, "")));
+ assertFalse(new MappedClientObject(1L, 1L, "").equals(new MappedClientObject(1L, 2L, "")));
+
+ assertTrue(new MappedClientObject(1L, null, "").equals(new MappedClientObject(1L, null, "")));
+ assertFalse(new MappedClientObject(null, null, "").equals(new MappedClientObject(1L, null, "")));
+
+ assertTrue(new MappedClientObject().equals(new MappedClientObject()));
+
+ assertFalse(new MappedClientObject().equals(null));
+ }
+
+ @Test
+ public void testToString() {
+ assertFalse(new MappedClientObject().toString().isEmpty());
+ assertFalse(new MappedClientObject(1L, 1L,"TEST").toString().isEmpty());
+ }
+
+ @Test
+ public void testHashCode() {
+ assertEquals(new MappedClientObject(1L,1L,"").hashCode(), new MappedClientObject(1L,1L,"").hashCode());
+ assertEquals(new MappedClientObject(1L,1L,"321").hashCode(), new MappedClientObject(1L,1L,"123").hashCode());
+ assertNotSame(new MappedClientObject(1L,1L,"").hashCode(), new MappedClientObject(1L,2L,"").hashCode());
+ assertNotSame(new MappedClientObject(1L,1L,"").hashCode(), new MappedClientObject(2L,1L,"").hashCode());
+ }
+
+}
Property changes on: trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/MappedClientObjectTest.java
___________________________________________________________________
Added: svn:mime-type
+ text/plain
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-18 08:54:12 UTC (rev 95)
+++ trunk/sandbox/cse-ip/sc-idmapper/src/test/java/de/campussource/cse/mapper/PersistentUnitConfigurationTest.java 2009-03-18 08:55:19 UTC (rev 96)
@@ -10,6 +10,9 @@
import org.junit.Test;
+/**
+ * @author Ingo Dueppe
+ */
public class PersistentUnitConfigurationTest {
@Test
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-18 08:54:12 UTC (rev 95)
+++ trunk/sandbox/cse-ip/sc-idmapper/src/test/resources/META-INF/persistence.xml 2009-03-18 08:55:19 UTC (rev 96)
@@ -8,7 +8,7 @@
<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.url" value="jdbc:mysql://localhost:3306/cseiptest?createDatabaseIfNotExist=true" />
<property name="toplink.jdbc.user" value="root" />
<property name="toplink.jdbc.password" value="masterkey" />
</properties>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
