You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by db...@apache.org on 2007/01/19 10:01:50 UTC

svn commit: r497746 - /incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestRunner.java

Author: dblevins
Date: Fri Jan 19 01:01:49 2007
New Revision: 497746

URL: http://svn.apache.org/viewvc?view=rev&rev=497746
Log:
fixed to not have the implementations hard-coded

Modified:
    incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestRunner.java

Modified: incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestRunner.java
URL: http://svn.apache.org/viewvc/incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestRunner.java?view=diff&rev=497746&r1=497745&r2=497746
==============================================================================
--- incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestRunner.java (original)
+++ incubator/openejb/trunk/openejb3/itests/openejb-itests-client/src/main/java/org/apache/openejb/test/TestRunner.java Fri Jan 19 01:01:49 2007
@@ -107,10 +107,9 @@
     }
 
     private static void runLocalTests() {
-        System.setProperty("openejb.test.server",
-                "org.apache.openejb.test.IvmTestServer");
-//        System.setProperty("openejb.test.database", "org.apache.openejb.test.DerbyTestDatabase");
-        System.setProperty("openejb.test.database", "org.apache.openejb.test.InstantDbTestDatabase");
+        setDefault("openejb.test.server", "org.apache.openejb.test.IvmTestServer");
+//        setDefault("openejb.test.database", "org.apache.openejb.test.DerbyTestDatabase");
+        setDefault("openejb.test.database", "org.apache.openejb.test.InstantDbTestDatabase");
 
         System.out.println("_________________________________________________");
         System.out
@@ -119,11 +118,15 @@
         System.out.println("_________________________________________________");
     }
 
+    private static void setDefault(String key, String value) {
+        value = System.getProperty(key, value);
+        System.setProperty(key, value);
+    }
+
     private static void runRemoteTests() {
-        System.setProperty("openejb.test.server",
-                "org.apache.openejb.test.RemoteTestServer");
-//        System.setProperty("openejb.test.database", "org.apache.openejb.test.DerbyTestDatabase");
-        System.setProperty("openejb.test.database", "org.apache.openejb.test.InstantDbTestDatabase");
+        setDefault("openejb.test.server", "org.apache.openejb.test.RemoteTestServer");
+//        setDefault("openejb.test.database", "org.apache.openejb.test.DerbyTestDatabase");
+        setDefault("openejb.test.database", "org.apache.openejb.test.InstantDbTestDatabase");
 
         System.out.println("_________________________________________________");
         System.out
@@ -133,10 +136,9 @@
     }
 
     private static void runRemoteHttpTests() {
-        System.setProperty("openejb.test.server",
-                "org.apache.openejb.test.RemoteHttpTestServer");
-//        System.setProperty("openejb.test.database", "org.apache.openejb.test.DerbyTestDatabase");
-        System.setProperty("openejb.test.database", "org.apache.openejb.test.InstantDbTestDatabase");
+        setDefault("openejb.test.server", "org.apache.openejb.test.RemoteHttpTestServer");
+//        setDefault("openejb.test.database", "org.apache.openejb.test.DerbyTestDatabase");
+        setDefault("openejb.test.database", "org.apache.openejb.test.InstantDbTestDatabase");
 
         System.out.println("_________________________________________________");
         System.out
@@ -146,9 +148,9 @@
     }
 
     private static void runTomcatRemoteHttpTests() {
-        System.setProperty("openejb.test.server", TomcatRemoteTestServer.class.getName());
-//        System.setProperty("openejb.test.database", "org.apache.openejb.test.DerbyTestDatabase");
-        System.setProperty("openejb.test.database", "org.apache.openejb.test.InstantDbTestDatabase");
+        setDefault("openejb.test.server", TomcatRemoteTestServer.class.getName());
+//        setDefault("openejb.test.database", "org.apache.openejb.test.DerbyTestDatabase");
+        setDefault("openejb.test.database", "org.apache.openejb.test.InstantDbTestDatabase");
 
         System.out.println("_________________________________________________");
         System.out