Updated testcase for emf 2.4

3 files changed, 23 insertions, 4 deletions

diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.schemaconstructs.AnyTypeAction/mysql_a_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.schemaconstructs.AnyTypeAction/mysql_a_o_package.jdo
index a4d44543a..169f4dadd 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.schemaconstructs.AnyTypeAction/mysql_a_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.schemaconstructs.AnyTypeAction/mysql_a_o_package.jdo
@@ -32,6 +32,15 @@
 			<version strategy="version-number" column="e_version"/>
 			<field name="name" persistence-modifier="persistent" null-value="exception"/>
 		</class>
+		<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype.impl.CImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="c" identity-type="datastore">
+			<implements name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype.C"/>
+			<implements name="org.eclipse.emf.ecore.EObject"/>
+			<implements name="org.eclipse.emf.common.notify.Notifier"/>
+			<inheritance strategy="new-table">
+				<discriminator column="dtype" strategy="value-map" value="C"/>
+			</inheritance>
+			<version strategy="version-number" column="e_version"/>
+		</class>
 		<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype.impl.TestAnyImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="testany" identity-type="datastore">
 			<implements name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype.TestAny"/>
 			<implements name="org.eclipse.emf.ecore.EObject"/>
@@ -62,6 +71,8 @@
 				</element>
 				<order column="TESTANY_MULTIANYTYPE_IDX"/>
 			</field>
+			<field name="a" persistence-modifier="persistent" null-value="exception"/>
+			<field name="aESet" persistence-modifier="persistent"/>
 			<field name="myAny" persistence-modifier="persistent" table="testany_myany">
 				<collection element-type="org.eclipse.emf.teneo.jpox.elist.AnyFeatureMapEntry"/>
 				<join/>
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.schemaconstructs.AnyTypeAction/mysql_s_o_package.jdo b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.schemaconstructs.AnyTypeAction/mysql_s_o_package.jdo
index ee7adfa51..00a6d5250 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.schemaconstructs.AnyTypeAction/mysql_s_o_package.jdo
+++ b/tests/org.eclipse.emf.teneo.jpox.test/jdo/org.eclipse.emf.teneo.test.emf.schemaconstructs.AnyTypeAction/mysql_s_o_package.jdo
@@ -28,6 +28,13 @@
 			<version strategy="version-number" column="e_version"/>
 			<field name="name" persistence-modifier="persistent" null-value="exception"/>
 		</class>
+		<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype.impl.CImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="c" identity-type="datastore">
+			<implements name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype.C"/>
+			<implements name="org.eclipse.emf.ecore.EObject"/>
+			<implements name="org.eclipse.emf.common.notify.Notifier"/>
+			<inheritance strategy="new-table"/>
+			<version strategy="version-number" column="e_version"/>
+		</class>
 		<class name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype.impl.TestAnyImpl" requires-extent="true" persistence-modifier="persistence-capable" detachable="true" table="testany" identity-type="datastore">
 			<implements name="org.eclipse.emf.teneo.samples.emf.schemaconstructs.anytype.TestAny"/>
 			<implements name="org.eclipse.emf.ecore.EObject"/>
@@ -56,6 +63,8 @@
 				</element>
 				<order column="TESTANY_MULTIANYTYPE_IDX"/>
 			</field>
+			<field name="a" persistence-modifier="persistent" null-value="exception"/>
+			<field name="aESet" persistence-modifier="persistent"/>
 			<field name="myAny" persistence-modifier="persistent" table="testany_myany">
 				<collection element-type="org.eclipse.emf.teneo.jpox.elist.AnyFeatureMapEntry"/>
 				<join/>
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/emf/schemaconstructs/AllTests.java b/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/emf/schemaconstructs/AllTests.java
index 0285e767b..bd65517ac 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/emf/schemaconstructs/AllTests.java
+++ b/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/emf/schemaconstructs/AllTests.java
@@ -11,7 +11,7 @@
  *   Martin Taal
  * </copyright>
  *
- * $Id: AllTests.java,v 1.16 2008/02/28 07:07:34 mtaal Exp $
+ * $Id: AllTests.java,v 1.17 2008/04/07 15:14:13 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.jpox.test.emf.schemaconstructs;
@@ -42,7 +42,7 @@ import org.eclipse.emf.teneo.test.emf.schemaconstructs.SubstitutionzvonAction;
  * All tests
  * 
  * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
- * @version $Revision: 1.16 $
+ * @version $Revision: 1.17 $
  */
 public class AllTests {
 
@@ -51,6 +51,7 @@ public class AllTests {
 				new MultiCfgTestSuite("Test for org.eclipse.emf.teneo.hibernate.test.emf.schemaconstructs", JPOXTestbed
 					.instance().getConfigurations());
 
+		suite.addTestSuite(AnyTypeAction.class);
 		suite.addTestSuite(DurationAction.class);
 
 		suite.addTestSuite(QNameAction.class);
@@ -61,8 +62,6 @@ public class AllTests {
 
 		suite.addTestSuite(EMapAction.class);
 
-		suite.addTestSuite(AnyTypeAction.class);
-
 		if (!JPOXTestbed.isRunningOnEMFTServer()) {
 			// on the emft server these fail with
 			// java.lang.UnsatisfiedLinkError: /opt/j2sdk1.4.2_12/jre/lib/i386/libawt.so: