Add description to failure message if it is available

[Ivan Sopov]

Hello.

In the final print of results ids of test failures are included, but
descriptions are not (they are also called interpretations in the previous
output). It seems to me that it would be convenient to have those
descriptions right next to failure ids. I mean this:

CustomConcurrentHashMapEntrySetRemoveIfTest []: Observed forbidden state:
false, true, true, true (Put T, Put F, Remove F)
CustomConcurrentHashMapEntrySetRemoveIfTest []: Observed forbidden state:
true, false, false, true (Put F, Put T, Cannot remove T)

instead of this:

CustomConcurrentHashMapEntrySetRemoveIfTest []: Observed forbidden state:
false, true, true, true
CustomConcurrentHashMapEntrySetRemoveIfTest []: Observed forbidden state:
true, false, false, true

Patch is attached.

Thanks,
Ivan.
-------------- next part --------------
diff -r 18db5d6682d7 jcstress-core/src/main/java/org/openjdk/jcstress/infra/grading/TestGrading.java
--- a/jcstress-core/src/main/java/org/openjdk/jcstress/infra/grading/TestGrading.java	Thu Nov 16 16:45:28 2017 +0100
+++ b/jcstress-core/src/main/java/org/openjdk/jcstress/infra/grading/TestGrading.java	Tue Dec 26 14:14:24 2017 +0300
@@ -90,7 +90,7 @@
             Expect ex = matched.expect();
             isPassed &= passed(ex, count);
             hasInteresting |= hasInteresting(ex, count);
-            failureMessages.add(failureMessage(s, ex, count));
+            failureMessages.add(failureMessage(s, ex, count, matched.description()));
 
             gradingResults.add(new GradingResult(
                     s,
@@ -105,7 +105,7 @@
             Expect ex = c.expect();
             isPassed &= passed(ex, 0);
             hasInteresting |= hasInteresting(ex, 0);
-            failureMessages.add(failureMessage("N/A", ex, 0));
+            failureMessages.add(failureMessage("N/A", ex, 0, c.description()));
 
             gradingResults.add(new GradingResult(
                     c.matchPattern(),
@@ -119,7 +119,7 @@
                 Comparator.comparing(c -> c.id));
     }
 
-    public static String failureMessage(String id, Expect expect, long count) {
+    public static String failureMessage(String id, Expect expect, long count, String description) {
         if (passed(expect, count)) {
             return null;
         } else {
@@ -128,7 +128,7 @@
                 case ACCEPTABLE_INTERESTING:
                     return null;
                 case FORBIDDEN:
-                    return "Observed forbidden state: " + id;
+                    return "Observed forbidden state: " + id + (description == null ? "" : " (" + description + ")");
                 case UNKNOWN:
                     return "Missing description";
                 default: