7904110: IDEA plugin: Update plugin for new message format

Reviewed-by: cstein

Author: JornVernee

README.md

@@ -12,14 +12,11 @@
 * For details on running JDK tests using the JDK _make test_ framework, see
   [Using "make test" (the run-test framework)][make-test].
 
+* For details on running jtreg tests using the IntelliJ IDE, see
+  [plugins/idea/README.md](plugins/idea/README.md)
+
 [faq]: https://openjdk.org/jtreg/faq.html
 [tagspec]: https://openjdk.org/jtreg/tag-spec.html
 [make-test]: https://github.com/openjdk/jdk/blob/master/doc/testing.md
 
 ## Using IntelliJ IDEA
-
-The `jtreg` repo also contains a plugin for the IntelliJ IDEA IDE.
-This is a convenience plugin which adds `jtreg` capabilities to the IDE.
-With this plugin, OpenJDK developers can write, run, and debug `jtreg` tests
-without leaving their IDE environment.  For more details, see the file
-[plugins/idea/README.md](plugins/idea/README.md) in this repo.

plugins/idea/README.md

@@ -98,7 +98,7 @@ If you click on the very first entry of the left panel (the one named 'Test Resu
 
 ### Creating new tests
 
-To create a new jtreg test, simply create a new file under a jtreg test root. Then add a javadoc comment like this:
+To create a new jtreg test, simply create a new file under a jtreg test root. Then add a comment like this:
 
 ```
 /*

plugins/idea/src/main/java/com/oracle/plugin/jtreg/runtime/JTRegTestListener.java

@@ -106,7 +106,7 @@ private static void reportJTRegResult(TestResult testResult) {
         if (status.isFailed() || status.isError()) {
             tcTestFailed("jtreg", status.getReason());
         } else if (status.isNotRun()) {
-            tcTestIgnored("jtreg");
+            tcTestIgnored("jtreg", status.getReason());
         }
 
         String duration = null;
@@ -157,7 +157,7 @@ private static void reportTestMethod(JUnitResults.TestMethod test, String classN
         tcTestStdErr(test.name(), test.stderrLines());
         switch (test.result()) {
             case FAILED -> tcTestFailed(test.name(), "");
-            case SKIPPED -> tcTestIgnored(test.name());
+            case SKIPPED -> tcTestIgnored(test.name(), test.skipReason());
         }
         tcTestFinished(test.name(), test.duration());
     }
@@ -218,8 +218,9 @@ private static void tcTestFailed(String testName, String message) {
                 "message='" + escapeName(message) + "' ]");
     }
 
-    private static void tcTestIgnored(String testName) {
-        System.out.println("##teamcity[testIgnored name='" + escapeName(testName) + "']");
+    private static void tcTestIgnored(String testName, String reason) {
+        System.out.println("##teamcity[testIgnored name='" + escapeName(testName) + "' "
+                + "message='" + escapeName(reason) + "']");
     }
 
     private static void tcTestFinished(String testName, String duration) {
@@ -244,11 +245,11 @@ private static String escapeName(String str) {
 
     private static class JUnitResults {
         private record TestMethod(String name, String methodName, Iteration iteration, Result result,
-                                  List<String> stderrLines, String duration) {
+                                  List<String> stderrLines, String duration, String skipReason) {
             enum Result {SUCCESSFUL, SKIPPED, FAILED}
 
             private record Iteration(int num, String name) {
-                private static final Pattern PATTERN = Pattern.compile("'\\[(?<num>\\d+)] (?<name>.*)'");
+                private static final Pattern PATTERN = Pattern.compile("\\[(?<num>\\d+)] (?<name>.*)");
 
                 private static Iteration parse(String iteration) {
                     Matcher m = PATTERN.matcher(iteration);
@@ -269,7 +270,10 @@ public TestClass(String name, String simpleName) {
         }
 
         private static final Pattern JUNIT_TEST_START = Pattern.compile(
-                "STARTED\\s+(?<class>[A-Za-z0-9._$]+)::(?<method>[A-Za-z0-9._$]+)\\s+(?<rest>.*)");
+                "(?<kind>STARTED|SKIPPED)\\s+(?<class>[A-Za-z0-9._$]+)::(?<method>[A-Za-z0-9._$]+)\\s+'(?<name>[^']+)'(?: (?<reason>.*))?");
+
+        private static final Pattern JUNIT_TEST_END = Pattern.compile(
+                "(?<status>SUCCESSFUL|ABORTED|FAILED)\\s+\\S+ '[^']+' \\[(?<milis>\\d+)ms]");
 
         private static Collection<TestClass> parse(Iterator<String> itt) {
             Map<String, TestClass> classesByName = new HashMap<>();
@@ -285,33 +289,41 @@ private static Collection<TestClass> parse(Iterator<String> itt) {
                     stdErr.add(line);
                     String className = m.group("class");
                     String methodName = m.group("method");
-                    TestMethod.Iteration iteration = TestMethod.Iteration.parse(m.group("rest"));
+                    TestMethod.Iteration iteration = TestMethod.Iteration.parse(m.group("name"));
                     String displayTestName = methodName + (iteration != null ? " [" + iteration.name() + "]" : "");
 
-                    do {
-                        line = itt.next();
-                        if (line.startsWith("JT Harness has limited the test output")) {
-                            // jtharness truncated the output. Discard this result
-                            // and look for the next one.
-                            continue outer;
+                    TestMethod.Result result;
+                    String duration = null;
+                    String skipReason = null;
+                    String kind = m.group("kind");
+                    if (kind.equals("STARTED")) {
+                        Matcher endMatcher;
+                        do {
+                            line = itt.next();
+                            if (line.startsWith("JT Harness has limited the test output")) {
+                                // jtharness truncated the output. Discard this result
+                                // and look for the next one.
+                                continue outer;
+                            }
+                            stdErr.add(line);
+                            endMatcher = JUNIT_TEST_END.matcher(line);
+                        } while (!endMatcher.find());
+
+                        String status = endMatcher.group("status");
+                        if (status.contains("FAILED") || status.contains("ABORTED")) {
+                            result = TestMethod.Result.FAILED;
+                        } else {
+                            result = TestMethod.Result.SUCCESSFUL;
                         }
-                        stdErr.add(line);
-                    } while (!line.startsWith("SUCCESSFUL") && !line.startsWith("ABORTED")
-                            && !line.startsWith("SKIPPED") && !line.startsWith("FAILED"));
 
-                    TestMethod.Result result;
-                    if (line.startsWith("SKIPPED")) {
-                        result = TestMethod.Result.SKIPPED;
-                    } else if (line.startsWith("FAILED") || line.startsWith("ABORTED")) {
-                        result = TestMethod.Result.FAILED;
+                        duration = endMatcher.group("milis"); // may be null for 'SKIPPED'
                     } else {
-                        result = TestMethod.Result.SUCCESSFUL;
+                        result = TestMethod.Result.SKIPPED;
+                        skipReason = m.group("reason");
                     }
-                    String[] lineParts = line.split(" ");
-                    String duration = lineParts[lineParts.length -1]; // e.g. '[64ms]'
-                    duration = duration.substring(1, duration.length() - 3); // drop '[' and 'ms]'
 
-                    TestMethod test = new TestMethod(displayTestName, methodName, iteration, result, stdErr, duration);
+                    TestMethod test = new TestMethod(displayTestName, methodName,
+                            iteration, result, stdErr, duration, skipReason);
                     String[] nestedClasses = dropPackage(className).split("\\$");
                     String classNameForLookup = className.replace('$', '.');
                     TestClass current = classesByName.computeIfAbsent(nestedClasses[0],