--- jsr166/src/test/tck/JSR166TestCase.java	2018/11/24 21:41:20	1.249
+++ jsr166/src/test/tck/JSR166TestCase.java	2019/02/22 19:27:47	1.253
@@ -460,6 +460,12 @@ public class JSR166TestCase extends Test
     public static boolean atLeastJava9()  { return JAVA_CLASS_VERSION >= 53.0; }
     public static boolean atLeastJava10() { return JAVA_CLASS_VERSION >= 54.0; }
     public static boolean atLeastJava11() { return JAVA_CLASS_VERSION >= 55.0; }
+    public static boolean atLeastJava12() { return JAVA_CLASS_VERSION >= 56.0; }
+    public static boolean atLeastJava13() { return JAVA_CLASS_VERSION >= 57.0; }
+    public static boolean atLeastJava14() { return JAVA_CLASS_VERSION >= 58.0; }
+    public static boolean atLeastJava15() { return JAVA_CLASS_VERSION >= 59.0; }
+    public static boolean atLeastJava16() { return JAVA_CLASS_VERSION >= 60.0; }
+    public static boolean atLeastJava17() { return JAVA_CLASS_VERSION >= 61.0; }
 
     /**
      * Collects all JSR166 unit tests as one suite.
@@ -550,6 +556,7 @@ public class JSR166TestCase extends Test
                 "HashMapTest",
                 "LinkedBlockingDeque8Test",
                 "LinkedBlockingQueue8Test",
+                "LinkedHashMapTest",
                 "LongAccumulatorTest",
                 "LongAdderTest",
                 "SplittableRandomTest",
@@ -1305,6 +1312,7 @@ public class JSR166TestCase extends Test
                                        Callable<Boolean> waitingForGodot) {
         for (long startTime = 0L;;) {
             switch (thread.getState()) {
+            default: break;
             case BLOCKED: case WAITING: case TIMED_WAITING:
                 try {
                     if (waitingForGodot == null || waitingForGodot.call())
@@ -1742,12 +1750,11 @@ public class JSR166TestCase extends Test
         }
     }
 
-    void assertImmutable(final Object o) {
+    void assertImmutable(Object o) {
         if (o instanceof Collection) {
             assertThrows(
                 UnsupportedOperationException.class,
-                new Runnable() { public void run() {
-                        ((Collection) o).add(null);}});
+                () -> ((Collection) o).add(null));
         }
     }
 
@@ -1807,8 +1814,8 @@ public class JSR166TestCase extends Test
     }
 
     public void assertThrows(Class<? extends Throwable> expectedExceptionClass,
-                             Runnable... throwingActions) {
-        for (Runnable throwingAction : throwingActions) {
+                             Action... throwingActions) {
+        for (Action throwingAction : throwingActions) {
             boolean threw = false;
             try { throwingAction.run(); }
             catch (Throwable t) {