Make SplitterFactoryTest's main run its tests; fix test drivers' main methods

java/Makefile

@@ -1220,21 +1220,19 @@ check-serialize:
 
 .PHONY: junit
 junit: daikon/Daikon.class
+	@# This is not a prerequisite, so that "make -j" does not run it concurrently
+	@# with compiling Daikon, whose classes the SplitterFactoryTest rules use.
+	${MAKE} ${AUTO_GENERATED_CLASSES_2}
 	@echo "Running unit (not system) tests..."
 	LC_ALL=en_US.UTF-8 ${JAVA_COMMAND} org.junit.runner.JUnitCore daikon.test.AllTestsSuite
 ifeq (${JAVA24}, 1)
 	@# These tests are not in AllTestsSuite, because AllTestsSuite must compile
 	@# under versions of Java that do not have java.lang.classfile.
 	LC_ALL=en_US.UTF-8 ${JAVA_COMMAND} org.junit.runner.JUnitCore daikon.test.AllTestsSuite24
 endif
-
-## TODO:  This target is never used!!!
-junit-all: junit
-	@# Alternately, MasterUnitTester could run SplitterFactoryTest,
-	@# but I'm having trouble with that, apparently due to hard-coded
-	@# directory paths.  And these tests are slow, so we want them to
-	@# be separate anyway.
-	${JAVA_COMMAND} daikon.test.split.SplitterFactoryTest
+	@# SplitterFactoryTest is not in AllTestsSuite, because SplitterFactoryTest
+	@# is generated after the rest of Daikon (including AllTestsSuite) is compiled.
+	LC_ALL=en_US.UTF-8 ${JAVA_COMMAND} org.junit.runner.JUnitCore daikon.test.split.SplitterFactoryTest
 
 ###
 ### Clover (code coverage)
@@ -1468,16 +1466,31 @@ daikon/test/split/SplitterFactoryTestUpdater.class: daikon/test/split/SplitterFa
 	${JAVAC_COMMAND} $<
 
 ## First, a file not generated via java-cpp.
-daikon/test/split/SplitterFactoryTest.java: daikon/test/split/SplitterFactoryTestUpdater.class
+# Depending on daikon/Daikon.class regenerates the test whenever Daikon is
+# recompiled, because SplitterFactory determines which splitters the test covers.
+# The rule for daikon/Daikon.class makes this file only after touching
+# daikon/Daikon.class, so this prerequisite does not cause a regress.
+# SPLITTER_UPDATER_ARGS is set by the update-splitter-goals target.
+daikon/test/split/SplitterFactoryTest.java: daikon/Daikon.class \
+		daikon/test/split/SplitterFactoryTestUpdater.class \
+		$(wildcard daikon/test/split/targets/*.spinfo daikon/test/split/targets/*.decls)
 	rm -f $@
 # Has expected errors while compiling splitter files.
 # Suppress output unless whole command fails.
-	(${JAVA_COMMAND} daikon.test.split.SplitterFactoryTestUpdater > /dev/null 2>&1) || ${JAVA_COMMAND} daikon.test.split.SplitterFactoryTestUpdater
+	(${JAVA_COMMAND} daikon.test.split.SplitterFactoryTestUpdater ${SPLITTER_UPDATER_ARGS} > /dev/null 2>&1) \
+	  || ${JAVA_COMMAND} daikon.test.split.SplitterFactoryTestUpdater ${SPLITTER_UPDATER_ARGS}
 	chmod a-w $@
 
 ${AUTO_GENERATED_CLASSES_2}: ${AUTO_GENERATED_FILES_2}
 	${JAVAC_COMMAND} ${AUTO_GENERATED_FILES_2}
 
+# Overwrites SplitterFactoryTest's goal files with the current SplitterFactory output.
+# Examine the differences (e.g., with "git diff") before committing them.
+.PHONY: update-splitter-goals
+update-splitter-goals: daikon/Daikon.class daikon/test/split/SplitterFactoryTestUpdater.class
+	rm -f daikon/test/split/SplitterFactoryTest.java
+	${MAKE} SPLITTER_UPDATER_ARGS=--update-goals ${AUTO_GENERATED_CLASSES_2}
+
 # Create the auto-generated files with jpp
 .PHONY: jpp
 jpp: ${PLUME_SCRIPTS} ${AUTO_GENERATED_FILES}

java/daikon/split/SplitterFactory.java

@@ -144,6 +144,15 @@ public static void load_splitters(PptTopLevel ppt, List<SpinfoFile> spfiles) {
     Global.debugSplit.fine("<<exit>>  load_splitters");
   }
 
+  /**
+   * Resets the counter that numbers splitter files, so that the names of subsequently-written
+   * splitter files do not depend on what splitters were created earlier in this JVM. Accessible for
+   * the purpose of testing.
+   */
+  public static void resetGuid() {
+    guid = 0;
+  }
+
   // Accessible for the purpose of testing.
   public static String getTempDir() {
     if (tempdir == null) {

java/daikon/test/AllTestsSuite.java

@@ -35,9 +35,8 @@
   daikon.test.TestQuant.class,
   daikon.test.TestAnnotate.class,
   daikon.test.DtraceDiffTester.class,
-  //       ,
-  //       // I'm having trouble with this; need to fix, reinstate, and not call
-  //       // specially from Makefile.  -MDE 7/8/2005
-  //       daikon.test.split.SplitterFactoryTest.class
+  // daikon.test.split.SplitterFactoryTest is not in this suite, because it is generated after the
+  // rest of Daikon (including this class) is compiled.  The Makefile's "junit" target runs it
+  // separately.
 })
 public final class AllTestsSuite {}

java/daikon/test/SampleTester.java

@@ -67,22 +67,23 @@ public class SampleTester {
   /** The usage message for this program. */
   private static String usage =
       StringsPlume.joinLines(
-          "Usage: java daikon.PrintInvariants [OPTION]... FILE",
+          "Usage: java daikon.test.SampleTester [OPTION]...",
           "  -h, --" + Daikon.help_SWITCH,
           "      Display this usage message",
-          "  --" + Daikon.config_option_SWITCH,
-          "      Specify a configuration option ",
-          "  --" + Daikon.debug_SWITCH,
-          "      Specify a logger to enable",
-          "  --" + Daikon.track_SWITCH,
-          "      Specify a class, varinfos, and ppt to debug track.",
-          "      Format is class<var1,var2,var3>@ppt");
+          "  --" + Daikon.config_option_SWITCH + " config_var=val",
+          "      Set the specified configuration variable",
+          "  --" + Daikon.debugAll_SWITCH,
+          "      Turn on all debug flags (voluminous output)",
+          "  --" + Daikon.debug_SWITCH + " logger",
+          "      Turn on the specified debug logger",
+          "  --" + Daikon.track_SWITCH + " class<var1,var2,var3>@ppt",
+          "      Print debug info on the specified invariant class, vars, and ppt");
 
   /**
-   * Runs the sample tests.
+   * Runs the tests without JUnit.
    *
-   * @param args command-line arguments
-   * @throws IOException if there is trouble reading a file
+   * @param args command-line arguments; see {@link #usage}
+   * @throws IOException if there is a problem reading a test file
    */
   public static void main(String[] args) throws IOException {
     try {
@@ -93,11 +94,11 @@ public static void main(String[] args) throws IOException {
   }
 
   /**
-   * Does the work of {@link #main}, but throws an exception rather than calling {@code
-   * System.exit}.
+   * This does the work of {@link #main(String[])}, but it never calls System.exit, so it is
+   * appropriate to be called programmatically.
    *
-   * @param args command-line arguments
-   * @throws IOException if there is trouble reading a file
+   * @param args command-line arguments; see {@link #usage}
+   * @throws IOException if there is a problem reading a test file
    */
   @SuppressWarnings("JUnitMethodInvoked") // mainHelper() runs the tests without JUnit
   public static void mainHelper(String[] args) throws IOException {
@@ -144,6 +145,10 @@ public static void mainHelper(String[] args) throws IOException {
           throw new Daikon.BugInDaikon("getopt() returned " + c);
       }
     }
+    if (g.getOptind() < args.length) {
+      throw new Daikon.UserError(
+          "Unexpected argument " + args[g.getOptind()] + "; run with -h for usage");
+    }
 
     daikon.LogHelper.setupLogs(Global.debugAll ? FINE : INFO);