More test coverage for scope locals

Author: AlanBateman

test/jdk/jdk/internal/misc/ThreadFlock/ThreadFlockTest.java

@@ -355,6 +355,26 @@ private void testStartConfined(ThreadFlock flock,
         }
     }
 
+    /**
+     * Test that start inherits scope-local bindings.
+     */
+    @Test(dataProvider = "factories")
+    public void testStartInheritsScopeLocals(ThreadFactory factory) throws Exception {
+        ScopeLocal<String> NAME = ScopeLocal.newInstance();
+        String value = ScopeLocal.where(NAME, "fred").call(() -> {
+            var result = new AtomicReference<String>();
+            try (var flock = ThreadFlock.open(null)) {
+                Thread thread = factory.newThread(() -> {
+                    // child
+                    result.set(NAME.get());
+                });
+                flock.start(thread);
+            }
+            return result.get();
+        });
+        assertEquals(value, "fred");
+    }
+
     /**
      * Test awaitAll with no threads.
      */
@@ -1055,6 +1075,21 @@ public void testStructureViolation5() {
         }
     }
 
+    /**
+     * Test that start throws StructureViolationException if scope-local bindings
+     * have changed.
+     */
+    @Test(dataProvider = "factories")
+    public void testStructureViolation6(ThreadFactory factory) throws Exception {
+        ScopeLocal<String> NAME = ScopeLocal.newInstance();
+        try (var flock = ThreadFlock.open(null)) {
+            ScopeLocal.where(NAME, "fred").run(() -> {
+                Thread thread = factory.newThread(() -> { });
+                expectThrows(StructureViolationException.class, () -> flock.start(thread));
+            });
+        }
+    }
+
     /**
      * Test Thread exiting with an open flock. The exiting thread should close the flock.
      */