The build.xml file now allows you to specify which configuration file

mgricken · mgricken · commit 5cd90afd0cb3 · 2007-02-11T08:50:05.000Z
is to be used using the "test-drjava-config" property (e.g. on the
command line by passing "-Dtest-drjava-config=some.file").

If this property is not set, then the build.xml file will use an empty
configuration file, testFiles/drjava.basic.config, which I have added
to the repository. This is an important change: Testing from now on
does NOT use the .drjava file in the user's home directory anymore,
unless explicitly told to do so. By default, the unit tests are now
run with default settings, regardless of the user's settings --This
line, and those below, will be ignored

AM   testFiles/drjava.basic.config
M    src/edu/rice/cs/drjava/DrJavaTestCase.java
M    build.xml


git-svn-id: file:///tmp/test-svn/trunk@4147 fe72c1cf-3628-48e9-8b72-1c46755d3cff
diff --git a/drjava/build.xml b/drjava/build.xml
@@ -89,6 +89,12 @@
     <echo message="              a plain text file with 'name=value' pairs, one per" />
     <echo message="              line. They work the same was as the properties" />
     <echo message="              specified on the command line using '-Dname=value'." />
+    <echo message="test-drjava-config: Specifies which DrJava configuration file is used" />
+    <echo message="                    during tests (by setting the 'test.drjava.config'" />
+    <echo message="                    property. This is effective only during unit tests" />
+    <echo message="                    and is the equivalent to the '-config' command" />
+    <echo message="                    line option. If this option is not used, then the" />
+    <echo message="                    testFiles/drjava.basic.config file is used." />
     <echo message="test-spec: A matching string to filter the tests to be run; may" />
     <echo message="           be comma-delimited to run multiple test sets." />
     <echo message="           (Default: empty string)" />
@@ -1098,11 +1104,26 @@
   </target>
   
   <target name="resolve-jvm-args">
-    <condition property="jvm-args" value="-server">
+    <!-- First create individual parts of the 'jvm-args' line; note that the space at
+         the end of the strings is necessary to separate the values. -->
+
+    <!-- 'force-server' property -->
+    <condition property="jvm-args-force-server" value="-server ">
       <istrue value="${force-server}" />
     </condition>
     <!-- else... -->
-    <property name="jvm-args" value="" />
+    <property name="jvm-args-force-server" value="" />
+
+    <!-- 'test-drjava-config' property -->
+    <condition property="jvm-args-test-drjava-config" value="-Dtest.drjava.config=${test-drjava-config} ">
+      <isset property="test-drjava-config" />
+    </condition>
+    <!-- else... -->
+    <property name="jvm-args-test-drjava-config" value="-Dtest.drjava.config=${basedir}/testFiles/drjava.basic.config " />
+
+    <!-- Now assemble all arguments; no spaces between the individual arguments so
+         arguments not set disappear completely (without multiple spaces inbetween).  -->
+    <property name="jvm-args" value="${jvm-args-force-server}${jvm-args-test-drjava-config}" />
   </target>
   
   <target name="resolve-test-formatter-class">
diff --git a/drjava/src/edu/rice/cs/drjava/DrJavaTestCase.java b/drjava/src/edu/rice/cs/drjava/DrJavaTestCase.java
@@ -41,7 +41,9 @@
  *  system is correctly initialized for every test.
  */
 public class DrJavaTestCase extends TestCase {
-  
+  /** System property with the name of an alternative DrJava configuration file used during testing. */
+  public static final String TEST_DRJAVA_CONFIG_PROPERTY = "test.drjava.config";
+    
   /** Create a new DrJava test case. */
   public DrJavaTestCase() { super(); }
 
@@ -56,6 +58,11 @@ public class DrJavaTestCase extends TestCase {
   protected void setUp() throws Exception {
     super.setUp();
     Utilities.TEST_MODE = true;
+    final String newName = System.getProperty(TEST_DRJAVA_CONFIG_PROPERTY);
+    if (newName!=null) {
+      DrJava.setPropertiesFile(newName);
+      DrJava._initConfig();
+    }
   }
 
   /** Clean up for every test case.
diff --git a/drjava/testFiles/drjava.basic.config b/drjava/testFiles/drjava.basic.config
@@ -0,0 +1,2 @@
+#DrJava configuration file
+#Sat Feb 10 22:12:47 CST 2007

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1,2 @@`
	`1`	`+#DrJava configuration file`
	`2`	`+#Sat Feb 10 22:12:47 CST 2007`