Modified: incubator/cayenne/main/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/conf/MappingAssertion.java URL: http://svn.apache.org/viewvc/incubator/cayenne/main/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/conf/MappingAssertion.java?rev=425931&r1=425930&r2=425931&view=diff ============================================================================== --- incubator/cayenne/main/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/conf/MappingAssertion.java (original) +++ incubator/cayenne/main/trunk/cayenne-jpa/src/test/java/org/apache/cayenne/jpa/conf/MappingAssertion.java Wed Jul 26 19:14:18 2006 @@ -34,8 +34,9 @@ import junit.framework.Assert; -import org.apache.cayenne.jpa.map.JpaAttribute; import org.apache.cayenne.jpa.map.JpaAttributeOverride; +import org.apache.cayenne.jpa.map.JpaAttributes; +import org.apache.cayenne.jpa.map.JpaBasic; import org.apache.cayenne.jpa.map.JpaColumn; import org.apache.cayenne.jpa.map.JpaColumnResult; import org.apache.cayenne.jpa.map.JpaEmbeddable; @@ -53,6 +54,7 @@ import org.apache.cayenne.jpa.map.JpaNamedNativeQuery; import org.apache.cayenne.jpa.map.JpaNamedQuery; import org.apache.cayenne.jpa.map.JpaOneToMany; +import org.apache.cayenne.jpa.map.JpaOneToOne; import org.apache.cayenne.jpa.map.JpaPrimaryKeyJoinColumn; import org.apache.cayenne.jpa.map.JpaQueryHint; import org.apache.cayenne.jpa.map.JpaSecondaryTable; @@ -61,6 +63,7 @@ import org.apache.cayenne.jpa.map.JpaTable; import org.apache.cayenne.jpa.map.JpaTableGenerator; import org.apache.cayenne.jpa.map.JpaUniqueConstraint; +import org.apache.cayenne.jpa.map.JpaVersion; /** * A helper test class that checks loaded entity map for processed annotations. @@ -202,8 +205,8 @@ assertNotNull(entity1.getPostLoad()); assertEquals("epostLoad", entity1.getPostLoad().getMethodName()); - assertEquals(1, entity1.getIds().size()); - assertId(entity1.getIds().iterator().next()); + assertEquals(1, entity1.getAttributes().getIds().size()); + assertId(entity1.getAttributes().getIds().iterator().next()); assertNull(entity1.getInheritance()); } @@ -267,7 +270,7 @@ assertNotNull(entity4); assertEquals("org.apache.cayenne.jpa.entity.MockEntity4", entity4.getClassName()); assertEquals("MockEntity4", entity4.getName()); - assertEmbeddedId(entity4.getEmbeddedId()); + assertEmbeddedId(entity4.getAttributes().getEmbeddedId()); } protected void assertEntity5(JpaEntity entity5) { @@ -275,7 +278,7 @@ assertEquals("MockEntity5", entity5.getName()); assertNotNull(entity5.getAttributes()); assertEquals(17, entity5.getAttributes().size()); - assertAttributes(new ArrayList<JpaAttribute>(entity5.getAttributes())); + assertAttributes(entity5.getAttributes()); } protected void assertSequenceGenerator1(JpaSequenceGenerator generator) { @@ -564,54 +567,53 @@ assertNotNull(mappedSuperclass3.getAttributes()); assertEquals(17, mappedSuperclass3.getAttributes().size()); - assertAttributes(new ArrayList<JpaAttribute>(mappedSuperclass3.getAttributes())); + assertAttributes(mappedSuperclass3.getAttributes()); } - protected void assertAttributes(List<JpaAttribute> attributes) { + protected void assertAttributes(JpaAttributes attributes) { // BASIC - assertNotNull(attributes.get(0).getBasic()); - assertEquals("attribute1", attributes.get(0).getName()); - assertTrue(attributes.get(0).getBasic().isOptional()); - assertSame(FetchType.EAGER, attributes.get(0).getBasic().getFetch()); + assertTrue(attributes.getBasicAttributes().size() > 0); + JpaBasic a0 = attributes.getBasicAttributes().iterator().next(); + assertEquals("attribute1", a0.getName()); + assertTrue(a0.isOptional()); + assertSame(FetchType.EAGER, a0.getFetch()); // VERSION - assertFalse(attributes.get(0).isVersion()); - assertTrue(attributes.get(1).isVersion()); - assertEquals("attribute2", attributes.get(1).getName()); + assertEquals(1, attributes.getVersionAttributes().size()); + JpaVersion a1 = attributes.getVersionAttributes().iterator().next(); + assertEquals("attribute2", a1.getName()); // ONE-TO_ONE - assertNull(attributes.get(1).getOneToOne()); - assertNotNull(attributes.get(2).getOneToOne()); - assertEquals("org.apache.cayenne.jpa.entity.MockTargetEntity1", attributes - .get(2) - .getOneToOne() + assertEquals(1, attributes.getOneToOneRelationships().size()); + JpaOneToOne a2 = attributes.getOneToOneRelationships().iterator().next(); + assertEquals("org.apache.cayenne.jpa.entity.MockTargetEntity1", a2 .getTargetEntityName()); - assertTrue(attributes.get(2).getOneToOne().isOptional()); - assertSame(FetchType.LAZY, attributes.get(2).getOneToOne().getFetch()); - assertEquals("mb1", attributes.get(2).getOneToOne().getMappedBy()); - Collection<CascadeType> cascades = attributes.get(2).getOneToOne().getCascades(); + assertTrue(a2.isOptional()); + assertSame(FetchType.LAZY, a2.getFetch()); + assertEquals("mb1", a2.getMappedBy()); + Collection<CascadeType> cascades = a2.getCascades(); assertEquals(2, cascades.size()); Iterator cascades1It = cascades.iterator(); assertSame(CascadeType.MERGE, cascades1It.next()); assertSame(CascadeType.PERSIST, cascades1It.next()); // ONE-TO-MANY - assertNull(attributes.get(2).getOneToMany()); - assertNotNull(attributes.get(3).getOneToMany()); - JpaOneToMany otm = attributes.get(3).getOneToMany(); - assertEquals("org.apache.cayenne.jpa.entity.MockTargetEntity2", otm + assertTrue(attributes.getOneToManyRelationships().size() > 0); + JpaOneToMany a3 = attributes.getOneToManyRelationships().iterator().next(); + assertEquals("org.apache.cayenne.jpa.entity.MockTargetEntity2", a3 .getTargetEntityName()); - assertSame(FetchType.LAZY, otm.getFetch()); - assertEquals("mb2", otm.getMappedBy()); - assertEquals(2, otm.getCascades().size()); - Iterator cascades2It = otm.getCascades().iterator(); + assertSame(FetchType.LAZY, a3.getFetch()); + assertEquals("mb2", a3.getMappedBy()); + assertEquals(2, a3.getCascades().size()); + Iterator cascades2It = a3.getCascades().iterator(); assertSame(CascadeType.MERGE, cascades2It.next()); assertSame(CascadeType.PERSIST, cascades2It.next()); // JOIN COLUMN - assertNotNull(attributes.get(9).getJoinColumns()); - assertEquals(1, attributes.get(9).getJoinColumns().size()); - JpaJoinColumn joinColumn = attributes.get(9).getJoinColumns().iterator().next(); + JpaOneToMany a9 = attributes.getOneToManyRelationship("attribute10"); + assertNotNull(a9.getJoinColumns()); + assertEquals(1, a9.getJoinColumns().size()); + JpaJoinColumn joinColumn = a9.getJoinColumns().iterator().next(); assertEquals("join-column-10", joinColumn.getName()); assertEquals("x-def", joinColumn.getColumnDefinition()); assertEquals("x-ref", joinColumn.getReferencedColumnName()); @@ -622,7 +624,7 @@ assertTrue(joinColumn.isUpdatable()); // LOB - assertFalse(attributes.get(10).isLob()); - assertTrue(attributes.get(11).isLob()); + assertNotNull(attributes.getBasicAttribute("attribute12")); + assertTrue(attributes.getBasicAttribute("attribute12").isLob()); } }
