From 7a46717616e9f908df95bcff48dff7e6b29af14a Mon Sep 17 00:00:00 2001 From: "Richard G. Curtis" Date: Wed, 21 Oct 2009 22:45:36 +0000 Subject: [PATCH] OPENJPA-859: Restructured testcase. Minor formatting change. git-svn-id: https://svn.apache.org/repos/asf/openjpa/trunk@828242 13f79535-47bb-0310-9956-ffa450edef68 --- .../persistence/TestMixedMappingLocation.java | 7 ++----- .../entity/MixedMappingLocationEmbeddedId.java | 2 ++ .../src/test/resources/META-INF/persistence.xml | 8 +------- .../apache/openjpa/persistence/entity}/orm.xml | 17 ++++++++++++++--- .../AnnotationPersistenceMetaDataParser.java | 14 +++++++------- 5 files changed, 26 insertions(+), 22 deletions(-) rename openjpa-persistence-jdbc/src/test/resources/{META-INF => org/apache/openjpa/persistence/entity}/orm.xml (68%) diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestMixedMappingLocation.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestMixedMappingLocation.java index 2af56454f..8324789b7 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestMixedMappingLocation.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/TestMixedMappingLocation.java @@ -18,20 +18,17 @@ */ package org.apache.openjpa.persistence; -import javax.persistence.Entity; - import org.apache.openjpa.persistence.entity.MixedMappingLocation; import org.apache.openjpa.persistence.entity.MixedMappingLocationEmbeddedId; import org.apache.openjpa.persistence.test.SingleEMFTestCase; // org.apache.openjpa.persistence.TestMixedMappingLocation -@Entity public class TestMixedMappingLocation extends SingleEMFTestCase { - @Override protected String getPersistenceUnitName() { - return "test_parsing"; + return "xml-persistence-unit"; } + public void setUp() { setUp(DROP_TABLES,MixedMappingLocationEmbeddedId.class, MixedMappingLocation.class); } diff --git a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/MixedMappingLocationEmbeddedId.java b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/MixedMappingLocationEmbeddedId.java index 47bea3d11..3d33c522a 100644 --- a/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/MixedMappingLocationEmbeddedId.java +++ b/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/entity/MixedMappingLocationEmbeddedId.java @@ -31,6 +31,8 @@ public class MixedMappingLocationEmbeddedId implements Serializable { @Basic private String country; + private String basic10; + public MixedMappingLocationEmbeddedId() { // TODO Auto-generated constructor stub } diff --git a/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml b/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml index 9ec4908a0..f3152c46b 100644 --- a/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml +++ b/openjpa-persistence-jdbc/src/test/resources/META-INF/persistence.xml @@ -20,7 +20,6 @@ - This needs to be listed because the OpenJPA test framework @@ -53,6 +52,7 @@ org/apache/openjpa/persistence/embed/embed-assoc-over-orm.xml org/apache/openjpa/persistence/detach/detach-orm.xml org/apache/openjpa/persistence/enhance/identity/mapsId-orm.xml + org/apache/openjpa/persistence/entity/orm.xml @@ -256,12 +256,6 @@ org.apache.openjpa.persistence.meta.MdrTestEntity - - org/apache/openjpa/persistence/entity/orm.xml - org.apache.openjpa.persistence.entity.MixedMappingLocation - org.apache.openjpa.persistence.entity.MixedMappingLocationEmbeddedId - - org/apache/openjpa/persistence/enhance/identity/mapsId-orm.xml org.apache.openjpa.persistence.enhance.identity.Employee1Xml diff --git a/openjpa-persistence-jdbc/src/test/resources/META-INF/orm.xml b/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/entity/orm.xml similarity index 68% rename from openjpa-persistence-jdbc/src/test/resources/META-INF/orm.xml rename to openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/entity/orm.xml index ead3a400a..bb433f100 100644 --- a/openjpa-persistence-jdbc/src/test/resources/META-INF/orm.xml +++ b/openjpa-persistence-jdbc/src/test/resources/org/apache/openjpa/persistence/entity/orm.xml @@ -17,8 +17,12 @@ regarding copyright ownership. The ASF licenses this file specific language governing permissions and limitations under the License. --> - - + + org.apache.openjpa.persistence.entity + @@ -26,5 +30,12 @@ under the License. - + + + + + + + + diff --git a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java index 924ef6e77..a98ca5f00 100644 --- a/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java +++ b/openjpa-persistence/src/main/java/org/apache/openjpa/persistence/AnnotationPersistenceMetaDataParser.java @@ -497,14 +497,14 @@ public class AnnotationPersistenceMetaDataParser // setup defaults (ie: Basic fields). ClassMetaData m = getRepository().getCachedMetaData(_cls); if (m == null) { - if (!(AccessController.doPrivileged(J2DoPrivHelper.isAnnotationPresentAction(_cls, Entity.class))) - .booleanValue() - && !(AccessController.doPrivileged(J2DoPrivHelper.isAnnotationPresentAction(_cls, Embeddable.class))) + if (!(AccessController.doPrivileged(J2DoPrivHelper.isAnnotationPresentAction(_cls, Entity.class))) .booleanValue() - && !(AccessController.doPrivileged(J2DoPrivHelper.isAnnotationPresentAction(_cls, - MappedSuperclass.class))).booleanValue()) - return null; - } + && !(AccessController.doPrivileged(J2DoPrivHelper.isAnnotationPresentAction(_cls, Embeddable.class))) + .booleanValue() + && !(AccessController.doPrivileged(J2DoPrivHelper.isAnnotationPresentAction(_cls, + MappedSuperclass.class))).booleanValue()) + return null; + } // find / create metadata ClassMetaData meta = (m == null) ? getMetaData() : m; if (meta == null)