Index: test.xml
===================================================================
RCS file: /home/eclipse/org.eclipse.ui.tests/test.xml,v
retrieving revision 1.2
diff -u -r1.2 test.xml
--- test.xml	8 Nov 2001 15:29:53 -0000	1.2
+++ test.xml	26 Nov 2001 18:57:20 -0000
@@ -1,15 +1,14 @@
 <?xml version="1.0"?>
 
 <project name="testsuite" default="run" basedir=".">
-  <!-- This file is intended to be more tightly coupled with the -->
-  <!-- org.eclipse.ui plugin, for testing. -->
-
   <!-- The property ${eclipse-home} should be passed into this script -->
+  <!-- Set a meaningful default value for when it is not. -->
+  <property name="eclipse-home" value="${basedir}\..\.."/>
 
   <!-- sets the properties eclipse-home, and library-file -->
-  <property name="eclipse-home" value="${basedir}\..\.."/>
   <property name="plugin-name" value="org.eclipse.ui.tests"/>
-  <property name="library-file" value="${eclipse-home}/fragments/org.eclipse.test/library.xml"/>
+  <property name="library-file"
+            value="${eclipse-home}/fragments/org.eclipse.test/library.xml"/>
 
   <!-- This target holds all initialization code that needs to be done for -->
   <!-- all tests that are to be run. Initialization for individual tests -->
@@ -23,35 +22,51 @@
 
   <!-- This target defines the tests that need to be run. -->
   <target name="suite">
-    <property name="location1" value="${eclipse-home}/ui_session_sniff_folder"/>
-    <delete dir="${location1}" quiet="true"/>
+    <property name="session-folder" 
+              value="${eclipse-home}/ui_session_sniff_folder"/>
+    <delete dir="${session-folder}" quiet="true"/>
     <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${location1}"/>
+      <property name="data-dir" value="${session-folder}"/>
       <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.ui.tests.api.SessionCreateTest"/>
+      <property name="classname" 
+                value="org.eclipse.ui.tests.api.SessionCreateTest"/>
     </ant>
     <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${location1}"/>
+      <property name="data-dir" value="${session-folder}"/>
       <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.ui.tests.api.SessionRestoreTest"/>
+      <property name="classname"
+                value="org.eclipse.ui.tests.api.SessionRestoreTest"/>
     </ant>
 
-    <property name="location2" value="${eclipse-home}/ui_sniff_folder"/>
-    <delete dir="${location2}" quiet="true"/>
+    <property name="sniff-folder"
+              value="${eclipse-home}/ui_sniff_folder"/>
+    <delete dir="${sniff-folder}" quiet="true"/>
     <ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
-      <property name="data-dir" value="${location2}"/>
+      <property name="data-dir" value="${sniff-folder}"/>
+      <property name="plugin-name" value="${plugin-name}"/>
+      <property name="classname"
+                value="org.eclipse.ui.tests.UiTestSuite"/>
+    </ant>
+    
+    <property name="jface-sniff-folder"
+              value="${eclipse-home}/jface_sniff_folder"/>
+    <delete dir="${jface-sniff-folder}" quiet="true"/>
+    <ant target="core-test" antfile="${library-file}" dir="${eclipse-home}">
+      <property name="data-dir" value="${jface-sniff-folder}"/>
       <property name="plugin-name" value="${plugin-name}"/>
-      <property name="classname" value="org.eclipse.ui.tests.UiTestSuite"/>
+      <property name="classname"
+                value="org.eclipse.jface.tests.viewers.AllTests"/>
     </ant>
   </target>
 
-  <!-- This target holds code to cleanup the testing environment after the tests -->
-  <!-- have been run. You can use this to delete temporary files that are created. -->
+  <!-- This target holds code to cleanup the testing environment after -->
+  <!-- after all of the tests have been run. You can use this target to -->
+  <!-- delete temporary files that have been created. -->
   <target name="cleanup">
   </target>
 
-  <!-- This target runs the test suite. Any actions that need to happen after all -->
-  <!-- the tests have been run should go here. -->
+  <!-- This target runs the test suite. Any actions that need to happen -->
+  <!-- after all the tests have been run should go here. -->
   <target name="run" depends="init,suite,cleanup">
     <ant target="collect" antfile="${library-file}" dir="${eclipse-home}">
       <property name="includes" value="org*.xml"/>