Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormtaal2007-07-11 17:14:37 +0000
committermtaal2007-07-11 17:14:37 +0000
commit47b4f8a157a88d98c241c461ddb48a9f822a58eb (patch)
tree4bbd4d9b6eaa96af1715f658ab9b741a8ea4a20c /tests/org.eclipse.emf.teneo.jpox.test/src
parent8302928d20e8a0d8b2eae1c7447feebcb4a775b6 (diff)
downloadorg.eclipse.emf.teneo-47b4f8a157a88d98c241c461ddb48a9f822a58eb.tar.gz
org.eclipse.emf.teneo-47b4f8a157a88d98c241c461ddb48a9f822a58eb.tar.xz
org.eclipse.emf.teneo-47b4f8a157a88d98c241c461ddb48a9f822a58eb.zip
[196181]
Diffstat (limited to 'tests/org.eclipse.emf.teneo.jpox.test/src')
-rw-r--r--tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/JPOXTestbed.java5
-rw-r--r--tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/emf/sample/AllGenerateTests.java7
-rw-r--r--tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/emf/sample/AllTests.java6
3 files changed, 13 insertions, 5 deletions
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/JPOXTestbed.java b/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/JPOXTestbed.java
index d9423c177..eee973434 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/JPOXTestbed.java
+++ b/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/JPOXTestbed.java
@@ -33,7 +33,7 @@ import org.jpox.enhancer.JPOXEnhancer;
* The jpox test bed controls the creation of the store and the generation of the mapping file.
*
* @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
- * @version $Revision: 1.41 $
+ * @version $Revision: 1.42 $
*/
public class JPOXTestbed extends Testbed {
@@ -185,6 +185,9 @@ public class JPOXTestbed extends Testbed {
options.put(PersistenceOptions.INHERITANCE_MAPPING, inheritanceType.getName());
options.put(PersistenceOptions.EMAP_AS_TRUE_MAP, "false");
+
+ options.putAll(test.getExtraConfigurationProperties());
+
// options.put(PersistenceOptions.QUALIFY_ENTITY_NAME,
// PersistenceOptions.QUALIFY_ENTITY_NAME_NSPREFIX);
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/emf/sample/AllGenerateTests.java b/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/emf/sample/AllGenerateTests.java
index b4ef19372..25c746509 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/emf/sample/AllGenerateTests.java
+++ b/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/emf/sample/AllGenerateTests.java
@@ -11,7 +11,7 @@
* Martin Taal
* </copyright>
*
- * $Id: AllGenerateTests.java,v 1.17 2007/07/11 14:42:56 mtaal Exp $
+ * $Id: AllGenerateTests.java,v 1.18 2007/07/11 17:14:37 mtaal Exp $
*/
package org.eclipse.emf.teneo.jpox.test.emf.sample;
@@ -24,6 +24,7 @@ import org.eclipse.emf.teneo.test.conf.MultiCfgTestSuite;
import org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction;
import org.eclipse.emf.teneo.test.emf.sample.ForumAction;
import org.eclipse.emf.teneo.test.emf.sample.InventoryAction;
+import org.eclipse.emf.teneo.test.emf.sample.LibraryFKAction;
import org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction;
import org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction;
import org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction;
@@ -41,13 +42,15 @@ import org.eclipse.emf.teneo.test.emf.sample.WorkFlowAction;
* All tests
*
* @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
- * @version $Revision: 1.17 $
+ * @version $Revision: 1.18 $
*/
public class AllGenerateTests {
public static Test suite() {
MultiCfgTestSuite suite =
new MultiCfgTestSuite("Test for org.eclipse.emf.teneo.test.samples", JPOXTestbed.instance()
.getConfigurations());
+ suite.addTest(new JPOXGenerateTest(LibraryFKAction.class));
+
suite.addTest(new JPOXGenerateTest(LibraryTest.testAction));
suite.addTest(new JPOXGenerateTest(RentalResourceReferenceAction.class));
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/emf/sample/AllTests.java b/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/emf/sample/AllTests.java
index 469ddb2c9..d061b5934 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/emf/sample/AllTests.java
+++ b/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/emf/sample/AllTests.java
@@ -11,7 +11,7 @@
* Martin Taal
* </copyright>
*
- * $Id: AllTests.java,v 1.24 2007/07/11 14:42:56 mtaal Exp $
+ * $Id: AllTests.java,v 1.25 2007/07/11 17:14:37 mtaal Exp $
*/
package org.eclipse.emf.teneo.jpox.test.emf.sample;
@@ -24,6 +24,7 @@ import org.eclipse.emf.teneo.test.conf.MultiCfgTestSuite;
import org.eclipse.emf.teneo.test.emf.sample.CatalogResourceAction;
import org.eclipse.emf.teneo.test.emf.sample.ForumAction;
import org.eclipse.emf.teneo.test.emf.sample.InventoryAction;
+import org.eclipse.emf.teneo.test.emf.sample.LibraryFKAction;
import org.eclipse.emf.teneo.test.emf.sample.LibraryGlobalEagerAction;
import org.eclipse.emf.teneo.test.emf.sample.LibraryNonResolvingAction;
import org.eclipse.emf.teneo.test.emf.sample.LibraryResourceAction;
@@ -40,7 +41,7 @@ import org.eclipse.emf.teneo.test.emf.sample.SunBooksAction;
* All tests
*
* @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
- * @version $Revision: 1.24 $
+ * @version $Revision: 1.25 $
*/
public class AllTests {
@@ -49,6 +50,7 @@ public class AllTests {
new MultiCfgTestSuite("Test for org.eclipse.emf.teneo.test.samples", JPOXTestbed.instance()
.getConfigurations());
+ suite.addTestSuite(LibraryFKAction.class);
suite.addTestSuite(LibraryTest.class);
suite.addTestSuite(RentalResourceReferenceAction.class);

Back to the top