Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormtaal2006-09-27 01:24:10 -0400
committermtaal2006-09-27 01:24:10 -0400
commit58490cf302850a899ddbfb612e0b4dd5c87434b4 (patch)
tree9dba99e7bfab04d75196a8e0cb67d1cf47c33b00
parentf5889f28c2e677ab57698077971dea5e1109ee53 (diff)
downloadorg.eclipse.emf.teneo-58490cf302850a899ddbfb612e0b4dd5c87434b4.tar.gz
org.eclipse.emf.teneo-58490cf302850a899ddbfb612e0b4dd5c87434b4.tar.xz
org.eclipse.emf.teneo-58490cf302850a899ddbfb612e0b4dd5c87434b4.zip
Added printlnbuild_200609270126
-rw-r--r--tests/org.eclipse.emf.teneo.jpox.test/src/emft_test.properties6
-rw-r--r--tests/org.eclipse.emf.teneo.jpox.test/src/local_test.properties6
-rw-r--r--tests/org.eclipse.emf.teneo.jpox.test/src/org/eclipse/emf/teneo/jpox/test/JPOXTestbed.java9
3 files changed, 9 insertions, 12 deletions
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/src/emft_test.properties b/tests/org.eclipse.emf.teneo.jpox.test/src/emft_test.properties
index 1acca2a79..e78a73e0b 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/src/emft_test.properties
+++ b/tests/org.eclipse.emf.teneo.jpox.test/src/emft_test.properties
@@ -10,7 +10,7 @@
# Martin Taal
# </copyright>
#
-# $Id: emft_test.properties,v 1.3 2006/09/26 08:39:12 mtaal Exp $
+# $Id: emft_test.properties,v 1.4 2006/09/27 05:24:10 mtaal Exp $
# <cfgname>.dbadapter= name of a dbadapter (see dbadapters.properties)
# <cfgname>.mapstrategy= mapping strategy, either AllInOne or TablePerClass
@@ -21,9 +21,9 @@
#mysql_a_o.dbadapter=mysql
#mysql_a_o.mapstrategy=SINGLE_TABLE
-#mysql_a_o.optimistic=false
+#mysql_a_o.optimistic=true
mysql_s_o.dbadapter=mysql
mysql_s_o.mapstrategy=JOINED
-mysql_s_o.optimistic=false
+mysql_s_o.optimistic=true
diff --git a/tests/org.eclipse.emf.teneo.jpox.test/src/local_test.properties b/tests/org.eclipse.emf.teneo.jpox.test/src/local_test.properties
index e3a80b11d..f80f71c58 100644
--- a/tests/org.eclipse.emf.teneo.jpox.test/src/local_test.properties
+++ b/tests/org.eclipse.emf.teneo.jpox.test/src/local_test.properties
@@ -10,7 +10,7 @@
# Martin Taal
# </copyright>
#
-# $Id: local_test.properties,v 1.3 2006/09/21 00:57:12 mtaal Exp $
+# $Id: local_test.properties,v 1.4 2006/09/27 05:24:10 mtaal Exp $
# <cfgname>.dbadapter= name of a dbadapter (see dbadapters.properties)
# <cfgname>.mapstrategy= mapping strategy, either AllInOne or TablePerClass
@@ -19,9 +19,9 @@
mysql_a_o.dbadapter=mysql
mysql_a_o.mapstrategy=SINGLE_TABLE
-mysql_a_o.optimistic=false
+mysql_a_o.optimistic=true
mysql_s_o.dbadapter=mysql
mysql_s_o.mapstrategy=JOINED
-mysql_s_o.optimistic=false
+mysql_s_o.optimistic=true
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 17869ccb5..e1aee2eb3 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.26 2006/09/26 15:21:41 mtaal Exp $
+ * $Id: JPOXTestbed.java,v 1.27 2006/09/27 05:24:10 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.26 $
+ * @version $Revision: 1.27 $
*/
public class JPOXTestbed extends Testbed {
@@ -74,23 +74,19 @@ public class JPOXTestbed extends Testbed {
/** Test the rundir */
static {
try {
- System.err.println("rundir: " + RUN_BASE_DIR);
if (RUN_BASE_DIR.indexOf("www-data") != -1) { // UGLY, replace with smarter solution!
runningOnEMFTServer = true;
log.debug("Path to jdo file directory does not exist: " + RUN_BASE_DIR);
final File pluginsDir = new File(System.getProperty("user.dir"), "plugins");
- System.err.println(pluginsDir.getAbsolutePath());
final File pluginDir = Utils.getPluginDir(pluginsDir, "org.eclipse.emf.teneo.jpox.test");
if (pluginDir != null) {
RUN_BASE_DIR = pluginDir.getAbsolutePath() + File.separator + "run";
- System.err.println("NOT NULL");
} else {
// error will be thrown later because class initialization errors are sometimes
// difficult to find
log.error("Directory for jdo files does not exist! " + pluginsDir.getAbsolutePath() +
File.separator + "org.eclipse.emf.teneo.jpox.test....");
}
- System.err.println(RUN_BASE_DIR);
}
} catch (Exception e) {
throw new StoreTestException("Exception while checking directory " + RUN_BASE_DIR, e);
@@ -122,6 +118,7 @@ public class JPOXTestbed extends Testbed {
* Request a store for the given configuration.
*/
public TestStore createStore(AbstractTest testCase) {
+ System.err.println("RUNNING TEST " + testCase.getClass().getName());
try {
if (!new File(RUN_BASE_DIR).exists()) {
log.error("Directory for jdo files does not exist " + RUN_BASE_DIR);

Back to the top