svn commit: r398034 - in /incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa: conf/MappingAssertion.java entity/MockEntity1.java entity/MockEntity2.java entity/MockEntity3.java entity/MockEntity4.java entity/MockEntity5.java

[aa...@apache.org]

Author: aadamchik
Date: Fri Apr 28 16:20:20 2006
New Revision: 398034

URL: http://svn.apache.org/viewcvs?rev=398034&view=rev
Log:
more DataMap converter stuff

Modified:
    incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/conf/MappingAssertion.java
    incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/entity/MockEntity1.java
    incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/entity/MockEntity2.java
    incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/entity/MockEntity3.java
    incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/entity/MockEntity4.java
    incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/entity/MockEntity5.java

Modified: incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/conf/MappingAssertion.java
URL: http://svn.apache.org/viewcvs/incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/conf/MappingAssertion.java?rev=398034&r1=398033&r2=398034&view=diff
==============================================================================
--- incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/conf/MappingAssertion.java (original)
+++ incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/conf/MappingAssertion.java Fri Apr 28 16:20:20 2006
@@ -143,8 +143,7 @@
     protected void assertEntity1(JpaEntity entity1) {
         assertNotNull(entity1);
         assertEquals("MockEntity1", entity1.getName());
-        assertEquals("org.apache.cayenne.jpa.entity.MockEntity1", entity1
-                .getClassName());
+        assertEquals("org.apache.cayenne.jpa.entity.MockEntity1", entity1.getClassName());
 
         assertTable(entity1.getTable());
 

Modified: incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/entity/MockEntity1.java
URL: http://svn.apache.org/viewcvs/incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/entity/MockEntity1.java?rev=398034&r1=398033&r2=398034&view=diff
==============================================================================
--- incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/entity/MockEntity1.java (original)
+++ incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/entity/MockEntity1.java Fri Apr 28 16:20:20 2006
@@ -56,7 +56,7 @@
         "pk1"
     })
 })
-@Entity
+@Entity(name = "MockEntity1")
 @Table(name = "mock_persistent_1", catalog = "catalog1", schema = "schema1", uniqueConstraints = {
         @UniqueConstraint(columnNames = {
                 "column1", "column2"

Modified: incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/entity/MockEntity2.java
URL: http://svn.apache.org/viewcvs/incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/entity/MockEntity2.java?rev=398034&r1=398033&r2=398034&view=diff
==============================================================================
--- incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/entity/MockEntity2.java (original)
+++ incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/entity/MockEntity2.java Fri Apr 28 16:20:20 2006
@@ -24,7 +24,7 @@
 import javax.persistence.PrimaryKeyJoinColumn;
 import javax.persistence.PrimaryKeyJoinColumns;
 
-@Entity
+@Entity(name = "MockEntity2")
 @PrimaryKeyJoinColumns(value = {
         @PrimaryKeyJoinColumn(name = "pk_column1", referencedColumnName = "super_column1", columnDefinition = "count(1)"),
         @PrimaryKeyJoinColumn(name = "pk_column2")

Modified: incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/entity/MockEntity3.java
URL: http://svn.apache.org/viewcvs/incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/entity/MockEntity3.java?rev=398034&r1=398033&r2=398034&view=diff
==============================================================================
--- incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/entity/MockEntity3.java (original)
+++ incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/entity/MockEntity3.java Fri Apr 28 16:20:20 2006
@@ -23,7 +23,7 @@
 import javax.persistence.InheritanceType;
 
 @Inheritance(strategy = InheritanceType.SINGLE_TABLE)
-@Entity
+@Entity(name = "MockEntity3")
 @DiscriminatorColumn(name = "column1", discriminatorType = DiscriminatorType.CHAR, columnDefinition = "count(1)", length = 5)
 @DiscriminatorValue(value = "DV")
 public class MockEntity3 {

Modified: incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/entity/MockEntity4.java
URL: http://svn.apache.org/viewcvs/incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/entity/MockEntity4.java?rev=398034&r1=398033&r2=398034&view=diff
==============================================================================
--- incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/entity/MockEntity4.java (original)
+++ incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/entity/MockEntity4.java Fri Apr 28 16:20:20 2006
@@ -21,7 +21,7 @@
 import javax.persistence.EmbeddedId;
 import javax.persistence.Entity;
 
-@Entity
+@Entity(name = "MockEntity4")
 public class MockEntity4 {
 
     @EmbeddedId

Modified: incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/entity/MockEntity5.java
URL: http://svn.apache.org/viewcvs/incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/entity/MockEntity5.java?rev=398034&r1=398033&r2=398034&view=diff
==============================================================================
--- incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/entity/MockEntity5.java (original)
+++ incubator/cayenne/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/entity/MockEntity5.java Fri Apr 28 16:20:20 2006
@@ -40,7 +40,7 @@
 import javax.persistence.UniqueConstraint;
 import javax.persistence.Version;
 
-@Entity
+@Entity(name = "MockEntity5")
 public class MockEntity5 {
 
     @Basic