jdk-sandbox: comparison jdk/test/tools/launcher/TestHelper.java

equal deleted inserted replaced

-:e667545511c7
+:224a28370893
 * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
 * or visit www.oracle.com if you need additional information or have any
 * questions.
 */
+import java.lang.annotation.ElementType;
+import java.lang.annotation.Retention;
+import java.lang.annotation.RetentionPolicy;
+import java.lang.annotation.Target;
+import java.lang.reflect.Method;
+import java.util.regex.Pattern;
 import java.io.StringWriter;
 import java.io.PrintWriter;
 import java.util.Set;
 import java.io.BufferedReader;
 import java.io.File;
 static final boolean isSDK = JAVAHOME.endsWith("jre");
 static final String javaCmd;
 static final String javawCmd;
 static final String java64Cmd;
 static final String javacCmd;
+static final String jarCmd;
 static final JavaCompiler compiler;
 static final boolean debug = Boolean.getBoolean("TestHelper.Debug");
 static final boolean isWindows =
 System.getProperty("os.name", "unknown").startsWith("Windows");
 File javacCmdFile = (isWindows)
 ? new File(binDir, "javac.exe")
 : new File(binDir, "javac");
 javacCmd = javacCmdFile.getAbsolutePath();
+File jarCmdFile = (isWindows)
+? new File(binDir, "jar.exe")
+: new File(binDir, "jar");
+jarCmd = jarCmdFile.getAbsolutePath();
+if (!jarCmdFile.canExecute()) {
+throw new RuntimeException("java <" + TestHelper.jarCmd +
+"> must exist and should be executable");
+}
 if (isWindows) {
 File javawCmdFile = new File(binDir, "javaw.exe");
 javawCmd = javawCmdFile.getAbsolutePath();
 if (!javawCmdFile.canExecute()) {
 throw new RuntimeException("java <" + javawCmd +
 } else {
 java64Cmd = null;
 }
 } else {
 java64Cmd = null;
+}
+}
+void run(String[] args) throws Exception {
+int passed = 0, failed = 0;
+final Pattern p = (args != null && args.length > 0)
+? Pattern.compile(args[0])
+: null;
+for (Method m : this.getClass().getDeclaredMethods()) {
+boolean selected = (p == null)
+? m.isAnnotationPresent(Test.class)
+: p.matcher(m.getName()).matches();
+if (selected) {
+try {
+m.invoke(this, (Object[]) null);
+System.out.println(m.getName() + ": OK");
+passed++;
+} catch (Throwable ex) {
+System.out.printf("Test %s failed: %s %n", m, ex.getCause());
+failed++;
+}
+}
+}
+System.out.printf("Passed: %d, Failed %d%n", passed, failed);
+if (failed > 0) {
+throw new RuntimeException("Tests failed: " + failed);
+}
+if (passed == 0 && failed == 0) {
+throw new AssertionError("No test(s) selected: passed = " +
+passed + ", failed = " + failed + " ??????????");
 }
 }
 /*
 * is a dual mode available in the test jdk
 StringWriter sw;
 int exitValue;
 List<String> testOutput;
 Map<String, String> env;
 Throwable t;
+boolean testStatus;
 public TestResult(String str, int rv, List<String> oList,
 Map<String, String> env, Throwable t) {
 sw = new StringWriter();
 status = new PrintWriter(sw);
 status.println("Executed command: " + str + "\n");
 exitValue = rv;
 testOutput = oList;
 this.env = env;
 this.t = t;
+testStatus = true;
 }
 void appendError(String x) {
 status.println(TEST_PREFIX + x);
 }
 }
 void checkNegative() {
 if (exitValue == 0) {
 appendError("test must not return 0 exit value");
+testStatus = false;
 testExitValue++;
 }
 }
 void checkPositive() {
 if (exitValue != 0) {
+testStatus = false;
 appendError("test did not return 0 exit value");
 testExitValue++;
 }
 }
 return exitValue == 0;
 }
 boolean isZeroOutput() {
 if (!testOutput.isEmpty()) {
+testStatus = false;
 appendError("No message from cmd please");
 testExitValue++;
 return false;
 }
 return true;
 }
 boolean isNotZeroOutput() {
 if (testOutput.isEmpty()) {
+testStatus = false;
 appendError("Missing message");
 testExitValue++;
 return false;
 }
 return true;
 }
 @Override
 public String toString() {
 status.println("++++Begin Test Info++++");
+status.println("Test Status: " + (testStatus ? "PASS" : "FAIL"));
 status.println("++++Test Environment++++");
 for (String x : env.keySet()) {
 indentStatus(x + "=" + env.get(x));
 }
 status.println("++++Test Output++++");
 appendError("string <" + stringToMatch + "> not found");
 testExitValue++;
 return false;
 }
 }
+/**
+* Indicates that the annotated method is a test method.
+*/
+@Retention(RetentionPolicy.RUNTIME)
+@Target(ElementType.METHOD)
+public @interface Test {}
 }

changeset 13411	224a28370893
parent 12561	63b05f2eabac
child 13416	9732a77088fe