[175195]

3 files changed, 16 insertions, 9 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 13cb5d75f..734f9d909 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
@@ -11,7 +11,7 @@
  *   Martin Taal
  * </copyright>
  *
- * $Id: JPOXTestbed.java,v 1.34 2007/02/01 12:34:05 mtaal Exp $
+ * $Id: JPOXTestbed.java,v 1.35 2007/03/05 20:51:26 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.jpox.test;
@@ -40,7 +40,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.34 $
+ * @version $Revision: 1.35 $
  */
 public class JPOXTestbed extends Testbed {
 	
@@ -209,9 +209,9 @@ public class JPOXTestbed extends Testbed {
 		// for superclass A because it will always search for package.jdo
 		try {
 			//File destination = copyMappingToClassesDir(test, mappingFile, optimistic);
-			//log.debug("JDO FILE: " + destination.getAbsolutePath());
 			JPOXEnhancer.main(new String[] { mappingFile.getAbsolutePath()});
 		} catch (Exception e) {
+			System.err.println("JDO FILE: " + mappingFile.getAbsolutePath());
 			throw new StoreTestException("Exception while enhancing", e);
 		}
 	}
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 c702ed8fe..eccedbffc 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.11 2007/02/01 12:34:05 mtaal Exp $
+ * $Id: AllGenerateTests.java,v 1.12 2007/03/05 20:51:25 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.jpox.test.emf.sample;
@@ -43,12 +43,15 @@ import extlibrary.ExtLibraryAction;
  * All tests
  * 
  * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
- * @version $Revision: 1.11 $
+ * @version $Revision: 1.12 $
  */
 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(ExtLibraryAction.class));
+
 		suite.addTest(new JPOXGenerateTest(LibraryPMControllerAction.class));
 
 		suite.addTest(new JPOXGenerateTest(LibraryTest.testAction));
@@ -62,8 +65,6 @@ public class AllGenerateTests {
 
 		suite.addTest(new JPOXGenerateTest(WorkFlowAction.class));
 		suite.addTest(new JPOXGenerateTest(SunBooksAction.class));
-		
-		suite.addTest(new JPOXGenerateTest(ExtLibraryAction.class));
 
 		suite.addTest(new JPOXGenerateTest(InventoryAction.class));
 		suite.addTest(new JPOXGenerateTest(CatalogResourceAction.class));
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/stores/JPOXTestStore.java b/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/stores/JPOXTestStore.java
index b6e900000..3f4c1ea74 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/stores/JPOXTestStore.java
+++ b/tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/stores/JPOXTestStore.java
@@ -11,7 +11,7 @@
  *   Martin Taal
  * </copyright>
  *
- * $Id: JPOXTestStore.java,v 1.12 2007/02/01 12:34:05 mtaal Exp $
+ * $Id: JPOXTestStore.java,v 1.13 2007/03/05 20:51:25 mtaal Exp $
  */
 
 package org.eclipse.emf.teneo.jpox.test.stores;
@@ -20,6 +20,7 @@ import java.io.File;
 import java.io.IOException;
 import java.sql.Connection;
 import java.util.Collection;
+import java.util.Date;
 import java.util.List;
 import java.util.Properties;
 
@@ -61,7 +62,7 @@ import org.jpox.metadata.InheritanceStrategy;
  * The jpox test store encapsulates the datastore actions to a jpox store.
  * 
  * @author <a href="mailto:mtaal@elver.org">Martin Taal</a>
- * @version $Revision: 1.12 $
+ * @version $Revision: 1.13 $
  */
 public class JPOXTestStore extends AbstractTestStore {
 	/** The logger */
@@ -455,4 +456,9 @@ public class JPOXTestStore extends AbstractTestStore {
 	public boolean isJPOXTestStore() {
 		return true;
 	}
+	
+	/** Set the xmlcalendar date */
+	public Object getDate(Date date) {
+		return date;
+	}
 }
\ No newline at end of file