You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@openjpa.apache.org by dw...@apache.org on 2009/09/17 19:29:02 UTC
svn commit: r816295 -
/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestEmbeddableSuperclass.java
Author: dwoods
Date: Thu Sep 17 17:29:01 2009
New Revision: 816295
URL: http://svn.apache.org/viewvc?rev=816295&view=rev
Log:
OPENJPA-1213 Use OpenJPAVersion for handling expected test result differences
Modified:
openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestEmbeddableSuperclass.java
Modified: openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestEmbeddableSuperclass.java
URL: http://svn.apache.org/viewvc/openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestEmbeddableSuperclass.java?rev=816295&r1=816294&r2=816295&view=diff
==============================================================================
--- openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestEmbeddableSuperclass.java (original)
+++ openjpa/trunk/openjpa-persistence-jdbc/src/test/java/org/apache/openjpa/persistence/compat/TestEmbeddableSuperclass.java Thu Sep 17 17:29:01 2009
@@ -20,6 +20,7 @@
import java.sql.Types;
+import org.apache.openjpa.conf.OpenJPAVersion;
import org.apache.openjpa.jdbc.conf.JDBCConfiguration;
import org.apache.openjpa.jdbc.meta.ClassMapping;
import org.apache.openjpa.jdbc.meta.FieldMapping;
@@ -66,10 +67,15 @@
assertTrue(fm.getStrategy() instanceof RelationFieldStrategy);
fm = cls.getFieldMapping("sup");
- // OPENJPA-1214 - OpenJPA 2 returns a EmbedFieldStrategy instead of a
- // RelationFieldStrategy as in prior releases.
- // assertTrue(fm.getStrategy() instanceof RelationFieldStrategy);
- assertTrue(fm.getStrategy() instanceof EmbedFieldStrategy);
+
+ if (OpenJPAVersion.MAJOR_RELEASE >= 2) {
+ // OPENJPA-1214 - OpenJPA 2 returns a EmbedFieldStrategy instead of
+ // a RelationFieldStrategy as in prior releases.
+ assertTrue(fm.getStrategy() instanceof EmbedFieldStrategy);
+ } else {
+ // Prior OpenJPA 1.2/1.3 behavior
+ assertTrue(fm.getStrategy() instanceof RelationFieldStrategy);
+ }
}
}